From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +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 | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 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 bd08849..bfde4ee 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
@@ -157,6 +157,9 @@
@ApiModelProperty("文化程度名称")
private String cultureLevelName;
+ @ApiModelProperty("职业")
+ private String profession;
+
@ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)")
private Integer marriage;
@@ -190,6 +193,33 @@
@ApiModelProperty("车辆列表")
private List<ComMngPopulationCarVO> carList;
+ @ApiModelProperty("吸毒信息")
+ private List<ComDrugPopulationVO> comDrugPopulationVOs;
+
+ @ApiModelProperty("社区矫正信息")
+ private List<ComCorrectPopulationVO> comCorrectPopulationVOs;
+
+ @ApiModelProperty("精神障碍信息")
+ private List<ComMajorPopulationVO> comMajorPopulationVOs;
+
+ @ApiModelProperty("邪教信息")
+ private List<ComCultPopulationVO> comCultPopulationVOs;
+
+ @ApiModelProperty("刑释信息")
+ private List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOs;
+
+ @ApiModelProperty("上访信息")
+ private List<ComKeyPopulationVO> comKeyPopulationVOs;
+
+ @ApiModelProperty("退役军人信息")
+ private List<ComVeteransPopulationVO> comVeteransPopulationVOs;
+
+ @ApiModelProperty("残疾人信息")
+ private List<ComDisabilityPopulationVO> comDisabilityPopulationVOs;
+
+ @ApiModelProperty("低保户信息")
+ private List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOs;
+
public interface sex{
int nan = 1;
int nv = 2;
--
Gitblit v1.7.1