From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java | 28 +++++++++++++---------------
1 files changed, 13 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..5970963 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
@@ -23,20 +23,6 @@
@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;
- }
-
public AddComActIntegralUserDTO(Long serviceId, Integer integralType, Long communityId, Long userId) {
this.serviceId = serviceId;
this.integralType = integralType;
@@ -44,6 +30,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