From 3b2c5fb47caca6ab286e0c8ed8c0575024c528d0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期六, 11 十月 2025 09:18:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java
index f28dcfc..8961563 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java
@@ -1,13 +1,10 @@
package cn.lili.modules.lmk.domain.entity;
+import cn.lili.modules.lmk.enums.general.PrizeActivityStatusEnum;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.ibatis.type.LocalDateTimeTypeHandler;
@@ -32,12 +29,12 @@
/** 娲诲姩鎻忚堪 */
private String activityDes;
- @TableField(value = "begin_time", typeHandler = LocalDateTimeTypeHandler.class)
+ @TableField(value = "begin_time")
/** 娲诲姩寮�濮嬫椂闂� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date beginTime;
- @TableField(value = "end_time", typeHandler = LocalDateTimeTypeHandler.class)
+ @TableField(value = "end_time")
/** 娲诲姩缁撴潫鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
@@ -59,8 +56,14 @@
private String activityCover;
@TableField("enable_status")
- /** 鏄惁寮�鍚椿鍔� */
+ /** 鏄惁寮�鍚椿鍔�
+ * @see PrizeActivityStatusEnum
+ * */
private String enableStatus;
-
+ @TableField("popup")
+ /**
+ * 鏄惁鏄脊绐楁椿鍔�
+ */
+ private Boolean popup;
}
--
Gitblit v1.8.0