From b72d8fea21aa1cda28c44c57e3cee78c42db5847 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期五, 09 九月 2022 09:50:02 +0800
Subject: [PATCH] Merge branch 'huacheng_push' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbActivityDO.java | 30 +-----------------------------
1 files changed, 1 insertions(+), 29 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbActivityDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbActivityDO.java
index ce9b3dc..b43a4aa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbActivityDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComPbActivityDO.java
@@ -20,7 +20,7 @@
/**
* id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -101,32 +101,4 @@
* 社区id
*/
private Long communityId;
- /**
- * 签到范围，默认0无限制
- */
- private Integer range;
- /**
- * 是否有积分奖励（1.是 2.否）
- */
- private Integer haveIntegralReward;
- /**
- * 积分奖励方式（1.按次奖励 2.记时奖励）
- */
- private Integer rewardWay;
- /**
- * 奖励积分
- */
- private Integer rewardIntegral;
- /**
- * 参与次数上限
- */
- private Integer limit;
- /**
- * 是否允许取消（1.允许 2.不允许）
- */
- private Integer canCancel;
- /**
- * 取消扣除积分
- */
- private Integer cancelDeduct;
}
--
Gitblit v1.7.1