From 31b8c6fc8c13f6a6e04362801eec0fce85af7366 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 11 十一月 2021 08:54:04 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 84b835c..5fd1e78 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,7 @@
@ApiModelProperty("业务id")
private Long serviceId;
- @ApiModelProperty("积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷）")
+ @ApiModelProperty("积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷）8活动签到")
private Integer integralType;
@ApiModelProperty(value = "社区id")
@@ -23,19 +23,8 @@
@ApiModelProperty(value = "是否是评论（1.是 2.否）")
private Integer isComment;
-
- /**
- * 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷）
- */
- public interface integralType{
- int fbssp = 1;
- int fbwxy = 2;
- int cyystp = 3;
- int cyzyzhd = 4;
- int cysqhd = 5;
- int cydyhd = 6;
- int cydcwj = 7;
- }
+ @ApiModelProperty(value = "签到类型 1居民 志愿者签到 2党员签到")
+ private Integer activityType;
public AddComActIntegralUserDTO(Long serviceId, Integer integralType, Long communityId, Long userId) {
this.serviceId = serviceId;
@@ -44,6 +33,18 @@
this.userId = userId;
}
- public AddComActIntegralUserDTO() {
+ public AddComActIntegralUserDTO() {}
+
+ /**
+ * 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷）
+ */
+ public interface integralType {
+ int fbssp = 1;
+ int fbwxy = 2;
+ int cyystp = 3;
+ int cyzyzhd = 4;
+ int cysqhd = 5;
+ int cydyhd = 6;
+ int cydcwj = 7;
}
}
--
Gitblit v1.7.1