From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java
index a3fb505..5983723 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComMngPopulationEditDTO.java
@@ -6,6 +6,7 @@
 import javax.validation.constraints.NotBlank;
 
 import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import com.panzhihua.common.model.vos.community.*;
 import com.panzhihua.common.validated.PutGroup;
 
 import io.swagger.annotations.ApiModel;
@@ -75,4 +76,37 @@
     @ApiModelProperty("房屋信息请求参数")
     private List<ComMngPopulationHouseEditDTO> houseEditDTOList;
 
+    @ApiModelProperty("吸毒信息")
+    private ComDrugPopulationVO comDrugPopulationVO;
+
+    @ApiModelProperty("社区矫正信息")
+    private ComCorrectPopulationVO comCorrectPopulationVO;
+
+    @ApiModelProperty("精神障碍信息")
+    private ComMajorPopulationVO comMajorPopulationVO;
+
+    @ApiModelProperty("邪教信息")
+    private ComCultPopulationVO comCultPopulationVO;
+
+    @ApiModelProperty("刑释信息")
+    private ComRehabilitationPopulationVO comRehabilitationPopulationVO;
+
+    @ApiModelProperty("上访信息")
+    private ComKeyPopulationVO comKeyPopulationVO;
+
+    @ApiModelProperty("退役军人信息")
+    private ComVeteransPopulationVO comVeteransPopulationVO;
+
+    @ApiModelProperty("残疾人信息")
+    private ComDisabilityPopulationVO comDisabilityPopulationVO;
+
+    @ApiModelProperty("低保户信息")
+    private ComLowSecurityPopulationVO comLowSecurityPopulationVO;
+
+    @ApiModelProperty("高龄老人信息")
+    private ComElderAuthElderliesVO comElderAuthElderliesVO;
+
+    @ApiModelProperty("养老人员信息")
+    private ComPensionAuthPensionerVO comPensionAuthPensionerVO;
+
 }

--
Gitblit v1.7.1