From 9e754d4c91e41b02a1e39d7ca709ec9491558da2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 09 Nov 2023 21:11:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/common/node/TreeNode.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/common/node/TreeNode.java b/src/main/java/org/springblade/common/node/TreeNode.java
index 79ab625..366c0db 100644
--- a/src/main/java/org/springblade/common/node/TreeNode.java
+++ b/src/main/java/org/springblade/common/node/TreeNode.java
@@ -24,7 +24,7 @@
 	 * 主键ID
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
-	private Long id;
+	private String id;
 
 	/**
 	 * 名称
@@ -32,10 +32,15 @@
 	private String name;
 
 	/**
+	 * 地址类型 1：小区  2：非小区  3:街路巷
+	 */
+	private Integer addressType;
+
+	/**
 	 * 父节点ID
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
-	private Long parentId;
+	private String parentId;
 
 	/**
 	 * 子孙节点

--
Gitblit v1.9.3