From 54119765bb38d7a18a833fd67433e52969e729c0 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 12 五月 2021 15:08:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 a98e4d1..4670491 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
@@ -115,7 +115,6 @@
@ApiModelProperty("修改时间")
private Date updateAt;
-
@ApiModelProperty("籍贯")
private String nativePlace;
@@ -138,18 +137,21 @@
@NotBlank(groups = {AddGroup.class},message = "是否租住不可为空")
private Integer isRent;
-
@ApiModelProperty("文化程度")
private String cultureLevel;
-
@ApiModelProperty("婚姻状况")
private String marriage;
-
@ApiModelProperty("健康状况")
private String healthy;
+ @ApiModelProperty("外地or本地（1.本地 2.外地）")
+ private Integer outOrLocal;
+
+ @ApiModelProperty("户口所在地")
+ private String censusRegister;
+
public interface sex{
int nan = 1;
int nv = 2;
--
Gitblit v1.7.1