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/resources/mapper/lmk/PrizeActivityMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml b/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
index 204c4fa..c4cee58 100644
--- a/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/PrizeActivityMapper.xml
@@ -14,6 +14,7 @@
<result column="activity_img" property="activityImg" />
<result column="activity_cover" property="activityCover" />
<result column="enable_status" property="enableStatus" />
+ <result column="popup" property="popup"/>
</resultMap>
@@ -52,7 +53,8 @@
LPA.activity_img,
LPA.activity_cover,
LPA.enable_status,
- LPA.id
+ LPA.id,
+ LPA.popup
FROM
lmk_prize_activity LPA
WHERE
--
Gitblit v1.8.0