From 8dd5c057222ea4f6d22d6bc3fba468600f14a330 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 28 十二月 2021 16:28:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java
index 54700b1..df3b6b8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ScreenDrawEventPopulationTotalVO.java
@@ -53,4 +53,46 @@
     @ApiModelProperty("网格员")
     private Integer WGYTotal = 6;
 
+    @ApiModelProperty("总户数")
+    private Integer houseTotal = 0;
+
+    @ApiModelProperty("残疾人")
+    private Integer disabilityTotal = 0;
+
+    @ApiModelProperty("低保户")
+    private Integer lowSecurityTotal = 0;
+
+    @ApiModelProperty("高龄老人")
+    private Integer elderTotal = 0;
+
+    @ApiModelProperty("特殊情况")
+    private Integer specialSituationTotal = 0;
+
+    @ApiModelProperty("其他")
+    private Integer otherTotal = 0;
+
+    @ApiModelProperty("特扶家庭")
+    private Integer specialHelpTotal = 0;
+
+    @ApiModelProperty("退役军人")
+    private Integer veteransTotal = 0;
+
+    @ApiModelProperty("老年人")
+    private Integer oldTotal = 0;
+
+    @ApiModelProperty("养老人员")
+    private Integer pensionTotal = 0;
+
+    @ApiModelProperty("出租房源")
+    private Integer rentingHouseTotal = 0;
+
+    @ApiModelProperty("社会工作者")
+    private Integer socialWorkerTotal = 0;
+
+    @ApiModelProperty("志愿者")
+    private Integer volunteerTotal = 0;
+
+    @ApiModelProperty("平均年龄")
+    private Integer averageAge = 0;
+
 }

--
Gitblit v1.7.1