From f37e7e5c00cb8196ff978f8eac2aab3fe9465b0d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 03 Nov 2023 10:04:48 +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..9e5c8f2 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：非小区
+	 */
+	private Integer addressType;
+
+	/**
 	 * 父节点ID
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
-	private Long parentId;
+	private String parentId;
 
 	/**
 	 * 子孙节点

--
Gitblit v1.9.3