From f6f928d81ad53f424f35a9149db11b301ed7f8a8 Mon Sep 17 00:00:00 2001
From: LuoTong <2232327099qq.com>
Date: 星期一, 22 四月 2024 16:25:05 +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 | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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..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
@@ -14,11 +14,10 @@
@ApiModelProperty("党员总数")
private Integer partyMemberCount;
- @ApiModelProperty("单位统计数据列表")
+ @ApiModelProperty("单位统计数据列表（时长倒序）")
private PageVO<List<UnitActivityAnalysisVO>> unitList;
-
- @ApiModelProperty("党员统计数据列表")
+ @ApiModelProperty("党员统计数据列表（时长倒序）")
private PageVO<List<PartyMemberAnalysisVO>> partyMemberList;
@ApiModelProperty("机关单位服务总次数")
@@ -32,4 +31,10 @@
@ApiModelProperty("党员服务总时长")
private Integer partyMemberServiceTotalTime;
+
+ @ApiModelProperty("报道单位累计总积分")
+ private Long awardSumCount;
+
+ @ApiModelProperty("报道党员累计总积分")
+ private Long partySumCount;
}
--
Gitblit v1.7.1