From db9d95db6f25f95cbc614525adef7dbdeae6478c Mon Sep 17 00:00:00 2001 From: tangxiaobao <303826152@qq.com> Date: 星期二, 27 七月 2021 16:58:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventStatisticsVO.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventStatisticsVO.java index 1a96ef1..5bc8bd6 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventStatisticsVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventStatisticsVO.java @@ -1,5 +1,7 @@ package com.panzhihua.common.model.vos.community.screen.event; +import com.panzhihua.common.model.vos.community.ComMngPopulationTotalVO; +import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,4 +24,10 @@ @ApiModelProperty("社区事件数据") private List<EventGridIncidentStatisticsVO> gridIncidentList; + @ApiModelProperty("小区列表数据") + private List<CivilVillageStatisticsVO> villageStatisticsList; + + @ApiModelProperty("人口统计数据") + private ComMngPopulationTotalVO populationTotalVO; + } -- Gitblit v1.7.1