From d6aabd981bf80cd57c09819f42b1c4e79f1904f9 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 21 九月 2022 10:13:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java
index 279d8f8..2144f2f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java
@@ -11,7 +11,8 @@
@ApiModelProperty("业务id")
private Long serviceId;
- @ApiModelProperty("积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷 8.活动签到 9.取消活动）")
+ @ApiModelProperty("积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 " +
+ "5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动）")
private Integer integralType;
@ApiModelProperty(value = "社区id")
@@ -26,6 +27,16 @@
@ApiModelProperty(value = "签到类型 1居民 志愿者签到 2党员签到")
private Integer activityType;
+ @ApiModelProperty(value = "以什么身份报名（1.居民 2.党员 3.志愿者）")
+ private Integer signIdentity;
+
+ @ApiModelProperty(value = "积分")
+ private Integer integral;
+
+ private Integer integralPartyTime;
+
+ private String remark;
+
public AddComActIntegralUserDTO(Long serviceId, Integer integralType, Long communityId, Long userId) {
this.serviceId = serviceId;
this.integralType = integralType;
@@ -36,17 +47,17 @@
public AddComActIntegralUserDTO() {}
/**
- * 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷 8.活动签到 9.取消活动）
+ * 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.社区活动-居民身份参与 " +
+ * "5.社区活动-党员身份参与 6.社区活动-志愿者身份参与 7.参与调查问卷 8.取消活动 9.参与单位党员活动）
*/
public interface integralType {
int fbssp = 1;
int fbwxy = 2;
int cyystp = 3;
- int cyzyzhd = 4;
- int cysqhd = 5;
+ int cyjmhd = 4;
+ int cyzyzhd = 5;
int cydyhd = 6;
int cydcwj = 7;
- int hdqd = 8;
- int qxhd = 9;
+ int qxhd = 8;
}
}
--
Gitblit v1.7.1