From fbfd98f72387b567d5de150b3656f540d70c2be1 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 23 七月 2021 11:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java
index c702109..d506522 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngHouseVo.java
@@ -17,6 +17,16 @@
     @JsonSerialize(using = ToStringSerializer.class)
     private Long houseId;
 
+    @ApiModelProperty("人口id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long populId;
+
+    @ApiModelProperty("人和房屋关系")
+    private Integer relationId;
+
+    @ApiModelProperty("与户主关系")
+    private Integer relation;
+
     @ApiModelProperty("房屋地址")
     private String address;
 

--
Gitblit v1.7.1