From 2af7739a8517d2d54c0b4f14af5c77e036cf653e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 31 五月 2021 14:50:51 +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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 4f83122..ff85fb5 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
@@ -6,6 +6,7 @@
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.model.vos.user.ComMngHouseVo;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -81,11 +82,11 @@
@ApiModelProperty("单元号")
@NotBlank(groups = {AddGroup.class},message = "单元号不可为空")
- private Integer unitNo;
+ private String unitNo;
@ApiModelProperty("户室（房间号）")
@NotBlank(groups = {AddGroup.class},message = "户室（房间号）不可为空")
- private Integer houseNo;
+ private String houseNo;
@ApiModelProperty("政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
@NotBlank(groups = {AddGroup.class},message = "政治面貌不可为空")
@@ -155,6 +156,12 @@
@ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
private Integer relation;
+ @ApiModelProperty("房屋列表")
+ private List<ComMngHouseVo> houseList;
+
+ @ApiModelProperty("车辆列表")
+ private List<ComMngPopulationCarVO> carList;
+
public interface sex{
int nan = 1;
int nv = 2;
--
Gitblit v1.7.1