From 095eb642b440c3c3b9ed2e553a666970ac1032ab Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 03 九月 2025 16:15:26 +0800
Subject: [PATCH] 用户消费金额与总订单数,按标签过滤会员,订单列表会员名称与导出

---
 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