From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +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/ComActEasyPhotoActivityDO.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java
index 04e774a..035024f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoActivityDO.java
@@ -1,14 +1,14 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
/**
* @auther lyq
@@ -25,7 +25,7 @@
/**
* 主键id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -34,7 +34,7 @@
private Long communityId;
/**
- * 活动状态（1.待开始 2.进行中 3.已结束 4.已取消）
+ * 活动状态（1.待开始 2.进行中 3.已结束 4.已取消）
*/
private Integer status;
@@ -74,6 +74,11 @@
private BigDecimal ordinaryReward;
/**
+ * 一般奖励金额
+ */
+ private BigDecimal commonlyReward;
+
+ /**
* 随手拍数量
*/
private Integer count;
@@ -87,30 +92,21 @@
*/
private String logo;
+ @Override
+ public String toString() {
+ return "ComActEasyPhotoActivityDO{" + "id=" + id + ", status=" + status + ", content=" + content
+ + ", activityStartAt=" + activityStartAt + ", activityEntAt=" + activityEndAt + ", releaseAt=" + releaseAt
+ + ", goodReward=" + goodReward + ", excellentReward=" + excellentReward + ", ordinaryReward="
+ + ordinaryReward + ", count=" + count + ", createAt=" + createAt + "}";
+ }
+
/**
- * 活动状态（1.待开始 2.进行中 3.已结束 4.已取消）
+ * 活动状态（1.待开始 2.进行中 3.已结束 4.已取消）
*/
- public interface status{
+ public interface status {
int dks = 1;
int jxz = 2;
int yjs = 3;
int yqx = 4;
- }
-
- @Override
- public String toString() {
- return "ComActEasyPhotoActivityDO{" +
- "id=" + id +
- ", status=" + status +
- ", content=" + content +
- ", activityStartAt=" + activityStartAt +
- ", activityEntAt=" + activityEndAt +
- ", releaseAt=" + releaseAt +
- ", goodReward=" + goodReward +
- ", excellentReward=" + excellentReward +
- ", ordinaryReward=" + ordinaryReward +
- ", count=" + count +
- ", createAt=" + createAt +
- "}";
}
}
\ No newline at end of file
--
Gitblit v1.7.1