From 3983e5809d0ed2ce551a157a1b5b326b217c9b9c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 08 七月 2022 16:46:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java
index 0ff8621..6946e0c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java
@@ -14,12 +14,17 @@
@ApiModelProperty("党员总数")
private Integer partyMemberCount;
- @ApiModelProperty("单位统计数据列表")
- private PageVO<List<UnitActivityAnalysisVO>> unitList;
+ @ApiModelProperty("单位统计数据列表（时长倒序）")
+ private PageVO<List<UnitActivityAnalysisVO>> unitListByTime;
+ @ApiModelProperty("党员统计数据列表（时长倒序）")
+ private PageVO<List<PartyMemberAnalysisVO>> partyMemberListByTime;
- @ApiModelProperty("党员统计数据列表")
- private PageVO<List<PartyMemberAnalysisVO>> partyMemberList;
+ @ApiModelProperty("单位统计数据列表（次数倒序）")
+ private PageVO<List<UnitActivityAnalysisVO>> unitListByTimes;
+
+ @ApiModelProperty("党员统计数据列表（次数倒序）")
+ private PageVO<List<PartyMemberAnalysisVO>> partyMemberByTimes;
@ApiModelProperty("机关单位服务总次数")
private Integer unitServiceTotalCount;
--
Gitblit v1.7.1