From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 4b00056..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;
@@ -12,7 +14,7 @@
* @date 2021/6/15 14:36
*/
@Data
-@ApiModel("大屏人口")
+@ApiModel("大屏-人口")
public class ComActPopulationScreenVO implements Serializable {
@@ -47,4 +49,11 @@
@ApiModelProperty("实有人口文化程度统计")
private List<ComActPopulationCultureVO> cultureGroup;
+ @ApiModelProperty("大屏网格数据")
+ private List<EventGridStatisticsVO> gridStatisticsList;
+
+ @ApiModelProperty("小区列表数据")
+ private List<CivilVillageStatisticsVO> villageStatisticsList;
+
+
}
--
Gitblit v1.7.1