From fb798e4982a392408b3e8324c69baba0824fe3fd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 03 Nov 2023 13:44:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 98437f5..d651e97 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/vo/DoorplateAddressVO.java
@@ -3,6 +3,11 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
+import org.springblade.modules.house.vo.HouseRentalVO;
+import org.springblade.modules.house.vo.HouseholdVO;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 门牌地址表（总台账数据） 视图实体类
@@ -15,4 +20,12 @@
public class DoorplateAddressVO extends DoorplateAddressEntity {
private static final long serialVersionUID = 1L;
+ private List<HouseRentalVO> houseRentalList = new ArrayList<>();
+
+ private List<HouseholdVO> householdList = new ArrayList<>();
+
+ //对应address_code 或者 doorplate_address_code
+ private String stdId;
+
+
}
--
Gitblit v1.9.3