From 09310a5a6da2ffccc17f460244fb9a09ec3ff68b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 25 八月 2025 17:55:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/domain/entity/PrizeActivity.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 22b0f94..558b021 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
@@ -28,12 +28,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;
@@ -58,5 +58,9 @@
/** 鏄惁寮�鍚椿鍔� */
private String enableStatus;
-
+ @TableField("popup")
+ /**
+ * 鏄惁鏄脊绐楁椿鍔�
+ */
+ private Boolean popup;
}
--
Gitblit v1.8.0