From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
index 42566d8..8ca1d83 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -26,7 +27,7 @@
/**
* 自增id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -98,6 +99,7 @@
/**
* 志愿者人数上限
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer volunteerMax;
/**
@@ -108,6 +110,7 @@
/**
* 参与者人数上限
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer participantMax;
/**
@@ -184,14 +187,38 @@
*/
private Integer haveIntegralReward;
/**
- * 积分奖励方式（1.按次奖励 2.记时奖励）
+ * 居民积分奖励方式（1.按次奖励 2.记时奖励）
*/
@TableField(updateStrategy = FieldStrategy.IGNORED)
- private Integer rewardWay;
+ private Integer participantRewardWay;
+
/**
- * 奖励积分
+ * 居民参与签到/打卡奖励积分
*/
- private Integer rewardIntegral;
+ private Integer participantRewardIntegral;
+
+ /**
+ * 志愿者积分奖励方式（1.按次奖励 2.记时奖励）
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Integer volunteerRewardWay;
+
+ /**
+ * 志愿者参与签到/打卡奖励积分
+ */
+ private Integer volunteerRewardIntegral;
+
+ /**
+ * 党员积分奖励方式（1.按次奖励 2.记时奖励）
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Integer pbRewardWay;
+
+ /**
+ * 党员参与签到/打卡奖励积分
+ */
+ private Integer pbRewardIntegral;
+
/**
* 参与次数上限
*/
@@ -211,7 +238,7 @@
private String activityType;
/**
- * 是否居民活动
+ * 是否项目
*/
private Integer isProject;
@@ -221,7 +248,7 @@
private Long projectId;
/**
- * 1志愿者活动 2居民活动 3党员活动 4项目活动
+ * 活动类型 1 社区活动 4项目活动 5服务活动
*/
private Integer type;
@@ -233,6 +260,7 @@
/**
* 党员参与者人数上限
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer partyMemberMax;
/**
* 签退范围，默认0无限制
@@ -253,4 +281,6 @@
private String phone;
private Long checkUnitId;
+
+ private Long topicId;
}
--
Gitblit v1.7.1