From 463add4ee035938f9622a6c981668620f097067d Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 21 八月 2025 15:29:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java | 17 ++++++++++-------
1 files changed, 10 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 4476df2..22b0f94 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
@@ -3,9 +3,10 @@
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;
/**
* 鎶藉娲诲姩
@@ -27,13 +28,15 @@
/** 娲诲姩鎻忚堪 */
private String activityDes;
- @TableField("begin_time")
+ @TableField(value = "begin_time", typeHandler = LocalDateTimeTypeHandler.class)
/** 娲诲姩寮�濮嬫椂闂� */
- private LocalDateTime beginTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date beginTime;
- @TableField("end_time")
+ @TableField(value = "end_time", typeHandler = LocalDateTimeTypeHandler.class)
/** 娲诲姩缁撴潫鏃堕棿 */
- private LocalDateTime endTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
@TableField("max_prize")
/** 姣忔棩鏈�澶ф娊濂栦笂闄� */
@@ -52,7 +55,7 @@
private String activityCover;
@TableField("enable_status")
- /** 鏄惁寮�鍚椿鍔� */
+ /** 鏄惁寮�鍚椿鍔� */
private String enableStatus;
--
Gitblit v1.8.0