From 4b344a457f2c430ca42a3a05a4b53181acada734 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 22 Nov 2023 14:22:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/common/node/TreeNode.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 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..8d96d04 100644
--- a/src/main/java/org/springblade/common/node/TreeNode.java
+++ b/src/main/java/org/springblade/common/node/TreeNode.java
@@ -24,18 +24,41 @@
 	 * 主键ID
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
-	private Long id;
+	private String id;
 
 	/**
 	 * 名称
 	 */
 	private String name;
 
+	private String neiName;
+
+	/**
+	 * 门牌类型
+	 */
+	private String doorplateType;
+
+	/**
+	 * 地址等级
+	 */
+	private Integer addressLevel;
+
+	/**
+	 * 房屋编码
+	 */
+	private String houseCode;
+
+
+	/**
+	 * 地址类型 1：小区  2：非小区  3:街路巷 4：商超
+	 */
+	private Integer addressType;
+
 	/**
 	 * 父节点ID
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
-	private Long parentId;
+	private String parentId;
 
 	/**
 	 * 子孙节点

--
Gitblit v1.9.3