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 | 9 ++++++++- 1 files changed, 8 insertions(+), 1 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 1430d3e..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,6 +26,8 @@ private List<HouseholdVO> householdList = new ArrayList<>(); + private List<UserHouseLabelEntity> userHouseLabelVOList = new ArrayList<>(); + private PlaceVO place; //对应address_code @@ -41,5 +43,10 @@ */ private Integer isJur; + /** + * 社区编号 + */ + private String communityCode; + } -- Gitblit v1.9.3