From 63b224f484539f7df68d90700596dbd4a8d18734 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 08 八月 2022 10:15:58 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserVO.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserVO.java
index 7cb6b50..3908e1a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/integral/ComActIntegralUserVO.java
@@ -6,8 +6,15 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+/**
+ * @title: ComActIntegralUserVO
+ * @projectName:
+ * @description: 小程序-积分统计返回参数
+ * @author: hans
+ * @date: 2022/08/02 16:01
+ */
@Data
-@ApiModel("小程序-用户积分页面返回参数")
+@ApiModel("小程序-积分统计返回参数")
public class ComActIntegralUserVO {
@ApiModelProperty("用户积分总额")
@@ -16,6 +23,21 @@
@ApiModelProperty("用户绑定社区")
private String communityName;
- @ApiModelProperty("用户积分列表")
+ @ApiModelProperty("社区活动已获积分")
+ private Integer actAmount;
+
+ @ApiModelProperty("居民积分总额")
+ private Integer residentAmount;
+
+ @ApiModelProperty("志愿者积分总额")
+ private Integer volunteerAmount;
+
+ @ApiModelProperty("党员积分总额")
+ private Integer partyMemberAmount;
+
+ @ApiModelProperty("单位党员活动已获积分")
+ private Integer unitPartyMemberAmount;
+
+ @ApiModelProperty("各社区已获积分统计")
private List<ComActIntegralUserListVO> integralUserList;
}
--
Gitblit v1.7.1