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 |    6 +++++-
 1 files changed, 5 insertions(+), 1 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..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
@@ -58,5 +58,9 @@
      /** 鏄惁寮�鍚椿鍔� */
     private String enableStatus;
 
-
+    @TableField("popup")
+    /**
+     * 鏄惁鏄脊绐楁椿鍔�
+     */
+    private Boolean popup;
 }

--
Gitblit v1.8.0