From 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 08 九月 2025 13:41:59 +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