From bf6989e1f9cc614cf0439f048280cbcdb78d4009 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 29 八月 2025 02:12:03 +0800
Subject: [PATCH] 提交本地代码
---
framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 c7f4bae..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,13 @@
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;
/**
* 鎶藉娲诲姩
@@ -29,12 +29,14 @@
/** 娲诲姩鎻忚堪 */
private String activityDes;
- @TableField("begin_time")
+ @TableField(value = "begin_time")
/** 娲诲姩寮�濮嬫椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date beginTime;
- @TableField("end_time")
+ @TableField(value = "end_time")
/** 娲诲姩缁撴潫鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
@TableField("max_prize")
@@ -54,8 +56,14 @@
private String activityCover;
@TableField("enable_status")
- /** 鏄惁寮�鍚椿鍔� */
+ /** 鏄惁寮�鍚椿鍔�
+ * @see PrizeActivityStatusEnum
+ * */
private String enableStatus;
-
+ @TableField("popup")
+ /**
+ * 鏄惁鏄脊绐楁椿鍔�
+ */
+ private Boolean popup;
}
--
Gitblit v1.8.0