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/modules/doorplateAddress/vo/DoorplateAddressVO.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java b/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java
index 00a6deb..da66a99 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java
@@ -3,9 +3,9 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
+import org.springblade.modules.house.entity.UserHouseLabelEntity;
 import org.springblade.modules.house.vo.HouseRentalVO;
 import org.springblade.modules.house.vo.HouseholdVO;
-import org.springblade.modules.place.entity.PlaceEntity;
 import org.springblade.modules.place.vo.PlaceVO;
 
 import java.util.ArrayList;
@@ -26,10 +26,27 @@
 
 	private List<HouseholdVO> householdList = new ArrayList<>();
 
+	private List<UserHouseLabelEntity> userHouseLabelVOList = new ArrayList<>();
+
 	private PlaceVO place;
 
-	//对应address_code 或者 doorplate_address_code
+	//对应address_code
 	private String stdId;
 
+	/**
+	 * roleName
+	 */
+	private String roleName;
+
+	/**
+	 * 是否有权限 1:是   2：否
+	 */
+	private Integer isJur;
+
+	/**
+	 * 社区编号
+	 */
+	private String communityCode;
+
 
 }

--
Gitblit v1.9.3