From 7034041e18f2354ac0f4b852f17a09b2144e1091 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 13 五月 2021 09:31:51 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 1d49dc4..4f83122 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
@@ -62,8 +62,10 @@
@ApiModelProperty("身份证号码")
@NotBlank(groups = {AddGroup.class},message = "身份证号码不可为空")
@EncryptDecryptField
- @Sensitive(strategy = SensitiveStrategy.ID_CARD)
private String cardNo;
+
+ @ApiModelProperty("出生年月")
+ private String birthday;
@ApiModelProperty("街路巷")
@NotBlank(groups = {AddGroup.class},message = "街路巷不可为空")
@@ -113,7 +115,6 @@
@ApiModelProperty("修改时间")
private Date updateAt;
-
@ApiModelProperty("籍贯")
private String nativePlace;
@@ -123,7 +124,7 @@
@ApiModelProperty("小区名字")
private String alley;
- @ApiModelProperty("户主关系")
+ @ApiModelProperty("户主关系列表")
private List<ComHouseMemberVo> comMngFamilyInfoVOS;
@ApiModelProperty("家庭成员信息")
@@ -136,18 +137,24 @@
@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("外地or本地（1.本地 2.外地）")
+ private Integer outOrLocal;
+
+ @ApiModelProperty("户口所在地")
+ private String censusRegister;
+
+ @ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
+ private Integer relation;
+
public interface sex{
int nan = 1;
int nv = 2;
--
Gitblit v1.7.1