From 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 16:17:08 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java
index 2ce4ac6..c41722d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EditComMngPopulationVO.java
@@ -105,23 +105,28 @@
     @ApiModelProperty("小区名字")
     private String alley;
 
-
     @ApiModelProperty("是否租住 是否租住(0.否 1.是)")
     @NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
     private Integer isRent;
 
+    @ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
+    private Integer cultureLevel;
 
-    @ApiModelProperty("文化程度")
-    private String cultureLevel;
-
-
-    @ApiModelProperty("婚姻状况")
-    private String marriage;
-
+    @ApiModelProperty("婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他)")
+    private Integer marriage;
 
     @ApiModelProperty("健康状况")
     private String healthy;
 
+    @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
+    private Integer relation;
+
+    @ApiModelProperty("外地or本地(1.本地  2.外地)")
+    private Integer outOrLocal;
+
+    @ApiModelProperty("户口所在地")
+    private String censusRegister;
+
     public interface sex{
         int nan = 1;
         int nv = 2;

--
Gitblit v1.7.1