From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期四, 19 八月 2021 17:53:40 +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/vos/community/ComMngPopulationVO.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 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 d0f1fde..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 @@ -194,31 +194,31 @@ private List<ComMngPopulationCarVO> carList; @ApiModelProperty("吸毒信息") - private ComDrugPopulationVO comDrugPopulationVO; + private List<ComDrugPopulationVO> comDrugPopulationVOs; @ApiModelProperty("社区矫正信息") - private ComCorrectPopulationVO comCorrectPopulationVO; + private List<ComCorrectPopulationVO> comCorrectPopulationVOs; @ApiModelProperty("精神障碍信息") - private ComMajorPopulationVO comMajorPopulationVO; + private List<ComMajorPopulationVO> comMajorPopulationVOs; @ApiModelProperty("邪教信息") - private ComCultPopulationVO comCultPopulationVO; + private List<ComCultPopulationVO> comCultPopulationVOs; @ApiModelProperty("刑释信息") - private ComRehabilitationPopulationVO comRehabilitationPopulationVO; + private List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOs; @ApiModelProperty("上访信息") - private ComKeyPopulationVO comKeyPopulationVO; + private List<ComKeyPopulationVO> comKeyPopulationVOs; @ApiModelProperty("退役军人信息") - private ComVeteransPopulationVO comVeteransPopulationVO; + private List<ComVeteransPopulationVO> comVeteransPopulationVOs; @ApiModelProperty("残疾人信息") - private ComDisabilityPopulationVO comDisabilityPopulationVO; + private List<ComDisabilityPopulationVO> comDisabilityPopulationVOs; @ApiModelProperty("低保户信息") - private ComLowSecurityPopulationVO comLowSecurityPopulationVO; + private List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOs; public interface sex{ int nan = 1; -- Gitblit v1.7.1