From f721ee13dc5f95f607bb25b09f73cae6a7123ed9 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期六, 17 四月 2021 17:56:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
index 3d1cd24..9028212 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -4,6 +4,7 @@
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
+import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -158,10 +159,10 @@
@ApiModelProperty("小区名字")
private String alley;
/**
- * 家庭成员
+ * 房屋成员
*/
- @ApiModelProperty("家庭成员")
- private List<ComMngFamilyInfoVO> comMngFamilyInfoVOS;
+ @ApiModelProperty("房屋成员")
+ private List<ComHouseMemberVo> comMngFamilyInfoVOS;
/**
* 是否租住(0.否 1.是)
@@ -171,6 +172,24 @@
private Integer isRent;
/**
+ * 文化程度
+ */
+ @ApiModelProperty("文化程度")
+ private String cultureLevel;
+
+ /**
+ * 婚姻状况
+ */
+ @ApiModelProperty("婚姻状况")
+ private String marriage;
+
+ /**
+ * 健康状况
+ */
+ @ApiModelProperty("健康状况")
+ private String healthy;
+
+ /**
* 性别（1.男 2.女 3.未知）
*/
public interface sex{
--
Gitblit v1.7.1