From 8dd5c057222ea4f6d22d6bc3fba468600f14a330 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 28 十二月 2021 16:28:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 e6e80bd..2c484a5 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
@@ -4,6 +4,7 @@
import java.util.Date;
import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -173,4 +174,39 @@
* 活动是否已默认好评
*/
private Integer isDefaultPraise;
+ /**
+ * 签到范围，默认0无限制
+ */
+ @TableField("`range`")
+ private Integer range;
+ /**
+ * 是否有积分奖励（1.是 2.否）
+ */
+ private Integer haveIntegralReward;
+ /**
+ * 积分奖励方式（1.按次奖励 2.记时奖励）
+ */
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Integer rewardWay;
+ /**
+ * 奖励积分
+ */
+ private Integer rewardIntegral;
+ /**
+ * 参与次数上限
+ */
+ @TableField("`limit`")
+ private Integer limit;
+ /**
+ * 是否允许取消（1.允许 2.不允许）
+ */
+ private Integer canCancel;
+ /**
+ * 取消扣除积分
+ */
+ private Integer cancelDeduct;
+ /**
+ * 活动类型
+ */
+ private String activityType;
}
--
Gitblit v1.7.1