From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java
index 961d105..e07bbb3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilStatisticsVO.java
@@ -29,4 +29,16 @@
     @ApiModelProperty("环比上月增长率")
     private BigDecimal rate;
 
+    @ApiModelProperty("党建引领数据")
+    private CivilPartyStatisticsVO civilPartyStatisticsVO;
+
+    @ApiModelProperty("社区治理数据")
+    private CivilGovernmentStatisticsVO civilGovernmentStatisticsVO;
+
+    @ApiModelProperty("网格管理数据")
+    private CivilGridStatisticsVO civilGridStatisticsVO;
+
+    @ApiModelProperty("便民服务数据")
+    private CivilConvenienceStatisticsVO civilConvenienceStatisticsVO;
+
 }

--
Gitblit v1.7.1