From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/common/node/TreeStringNode.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/common/node/TreeStringNode.java b/src/main/java/org/springblade/common/node/TreeStringNode.java
index cb36813..998e793 100644
--- a/src/main/java/org/springblade/common/node/TreeStringNode.java
+++ b/src/main/java/org/springblade/common/node/TreeStringNode.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import org.springblade.modules.category.dto.CategoryDTO;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -37,6 +36,11 @@
 	 * 小区编码
 	 */
 	private String aoiCode;
+
+	/**
+	 * 社区编码
+	 */
+	private String neiCode;
 
 	/**
 	 * 门牌类型
@@ -91,13 +95,12 @@
 	private List<TreeStringNode> children = new ArrayList<>();
 
 	/**
-	 * 标签节点
-	 */
-	private List<CategoryDTO> categoryList;
-
-	/**
 	 * 是否有子孙节点
 	 */
 	@JsonInclude(JsonInclude.Include.NON_EMPTY)
 	private Boolean hasChildren;
+	/**
+	 * 无诈类型
+	 */
+	private Integer noExplosionCategory;
 }

--
Gitblit v1.9.3