From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/common/node/TreeStringNode.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/common/node/TreeStringNode.java b/src/main/java/org/springblade/common/node/TreeStringNode.java
index b8d0995..cb36813 100644
--- a/src/main/java/org/springblade/common/node/TreeStringNode.java
+++ b/src/main/java/org/springblade/common/node/TreeStringNode.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import org.springblade.modules.category.dto.CategoryLabelDTO;
+import org.springblade.modules.category.dto.CategoryDTO;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -34,6 +34,11 @@
 	private String neiName;
 
 	/**
+	 * 小区编码
+	 */
+	private String aoiCode;
+
+	/**
 	 * 门牌类型
 	 */
 	private String doorplateType;
@@ -55,6 +60,26 @@
 	private Integer addressType;
 
 	/**
+	 * 与角色关系
+	 */
+	private Integer relationship;
+
+	/**
+	 * 是否九小场所
+	 */
+	private Integer isNine;
+
+	/**
+	 * 是否阵地
+	 */
+	private Integer isFront;
+
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+
+	/**
 	 * 父节点ID
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
@@ -68,7 +93,7 @@
 	/**
 	 * 标签节点
 	 */
-	private List<CategoryLabelDTO> categoryLabelList;
+	private List<CategoryDTO> categoryList;
 
 	/**
 	 * 是否有子孙节点

--
Gitblit v1.9.3