From 224e0bbfc8d24785fea2e0160c36d7a8f6cd7269 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 21 Dec 2023 14:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/vo/HouseVO.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/vo/HouseVO.java b/src/main/java/org/springblade/modules/house/vo/HouseVO.java
index 27dfb06..85015f8 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseVO.java
@@ -17,7 +17,6 @@
 package org.springblade.modules.house.vo;
 
 import org.springblade.modules.house.entity.HouseEntity;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -40,5 +39,23 @@
 	 */
 	private String address;
 
-	private List<HouseLabelVO> houseLabelVOList = new ArrayList<>();
+	/**
+	 * 街道编号
+	 */
+	private String streetCode;
+	/**
+	 * 街道名称
+	 */
+	private String townStreetName;
+	/**
+	 * 社区名称
+	 */
+	private String neiName;
+
+	/**
+	 * 网格名称
+	 */
+	private String gridName;
+
+	private List<UserHouseLabelVO> userHouseLabelVOList = new ArrayList<>();
 }

--
Gitblit v1.9.3