From 9576bebcacea938771f6f5b51d958e6a4ac59df6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 09 十二月 2021 16:59:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java
index 10bda85..c9daa3e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java
@@ -1,11 +1,14 @@
package com.panzhihua.common.model.vos;
+import java.util.List;
+
+import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
+import com.panzhihua.common.model.vos.community.CommunityGovernanceTrendsVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -26,7 +29,10 @@
@ApiModelProperty("党员人数")
private Integer partymemberUser;
@ApiModelProperty("代办事件")
- List<TodoEventsVO> todoEventsVOList;
-
+ private List<TodoEventsVO> todoEventsVOList;
+ @ApiModelProperty("社区治理动态")
+ private CommunityGovernanceTrendsVO communityGovernanceTrendsVO;
+ @ApiModelProperty("社区活动情况")
+ private List<CommunityActivitiesVO> communityActivitiesVOS;
}
--
Gitblit v1.7.1