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 |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 78589dc..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,5 +1,6 @@
 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;
@@ -55,8 +56,14 @@
     private String activityCover;
 
     @TableField("enable_status")
-     /** 鏄惁寮�鍚椿鍔� */
+     /** 鏄惁寮�鍚椿鍔�
+      * @see PrizeActivityStatusEnum
+      * */
     private String enableStatus;
 
-
+    @TableField("popup")
+    /**
+     * 鏄惁鏄脊绐楁椿鍔�
+     */
+    private Boolean popup;
 }

--
Gitblit v1.8.0