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/vos/community/ComMngPopulationVO.java |    6 ++++++
 1 files changed, 6 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 ffcd7e4..48daa8c 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
@@ -222,6 +222,12 @@
     @ApiModelProperty("低保户信息")
     private List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOs;
 
+    @ApiModelProperty("高龄老人信息")
+    private List<ComElderAuthElderliesVO> comElderAuthElderliesVOList;
+
+    @ApiModelProperty("养老人员信息")
+    private List<ComPensionAuthPensionerVO> comPensionAuthPensionerVOList;
+
     public interface sex {
         int nan = 1;
         int nv = 2;

--
Gitblit v1.7.1