From 06620a6b0e64126e216edab8fced4597b38936b3 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 21 六月 2021 13:55:11 +0800
Subject: [PATCH] [修改]合并test_excel分支到test分支。解决部分冲突。
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexStatisticsVO.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexStatisticsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexStatisticsVO.java
index 0672c4c..7c1c932 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexStatisticsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/index/IndexStatisticsVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community.screen.index;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,4 +28,7 @@
@ApiModelProperty("特殊人群统计模块数据")
private List<IndexSpecialStatisticsVO> specialStatisticsVOList;
+
+ @ApiModelProperty("党建模块数据")
+ private BigScreenStatisticPartyBuild statisticPartyBuild;
}
--
Gitblit v1.7.1