From 26e9429512245f4b441b55c3ce59c21a5ebb570f Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 12:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/test_excel610' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComActPopulationScreenVO.java |    8 --------
 1 files changed, 0 insertions(+), 8 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 7484d6d..63053cf 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,7 +1,5 @@
 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;
@@ -48,11 +46,5 @@
 
     @ApiModelProperty("实有人口文化程度统计")
     private List<ComActPopulationCultureVO> cultureGroup;
-
-    @ApiModelProperty("大屏网格数据")
-    private List<EventGridStatisticsVO> gridStatisticsList;
-
-    @ApiModelProperty("小区列表数据")
-    private List<CivilVillageStatisticsVO> villageStatisticsList;
 
 }

--
Gitblit v1.7.1