From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 6946e0c..19d35bb 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
@@ -15,16 +15,10 @@
private Integer partyMemberCount;
@ApiModelProperty("单位统计数据列表（时长倒序）")
- private PageVO<List<UnitActivityAnalysisVO>> unitListByTime;
+ private PageVO<List<UnitActivityAnalysisVO>> unitList;
@ApiModelProperty("党员统计数据列表（时长倒序）")
- private PageVO<List<PartyMemberAnalysisVO>> partyMemberListByTime;
-
- @ApiModelProperty("单位统计数据列表（次数倒序）")
- private PageVO<List<UnitActivityAnalysisVO>> unitListByTimes;
-
- @ApiModelProperty("党员统计数据列表（次数倒序）")
- private PageVO<List<PartyMemberAnalysisVO>> partyMemberByTimes;
+ private PageVO<List<PartyMemberAnalysisVO>> partyMemberList;
@ApiModelProperty("机关单位服务总次数")
private Integer unitServiceTotalCount;
@@ -37,4 +31,10 @@
@ApiModelProperty("党员服务总时长")
private Integer partyMemberServiceTotalTime;
+
+ @ApiModelProperty("报道单位累计总积分")
+ private Long awardSumCount;
+
+ @ApiModelProperty("报道党员累计总积分")
+ private Long partySumCount;
}
--
Gitblit v1.7.1