From 5fc3fd7cbad93a8bc4a0d13f8217d4e2642450df Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 06 九月 2021 11:30:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
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