From 1a054c486c9037b7cb0bca5c4472c628d1d1c36c Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期一, 28 六月 2021 16:54:06 +0800 Subject: [PATCH] 解决代码被合并后删除问题 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java index 63053cf..c64e500 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java @@ -1,5 +1,7 @@ package com.panzhihua.common.model.vos.screen; +import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO; +import com.panzhihua.common.model.vos.community.screen.event.EventGridStatisticsVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -47,4 +49,11 @@ @ApiModelProperty("实有人口文化程度统计") private List<ComActPopulationCultureVO> cultureGroup; + @ApiModelProperty("大屏网格数据") + private List<EventGridStatisticsVO> gridStatisticsList; + + @ApiModelProperty("小区列表数据") + private List<CivilVillageStatisticsVO> villageStatisticsList; + + } -- Gitblit v1.7.1