From f3ccf81a4f203dd0d8957bab15c491cb2181e071 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 19:21:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/resources/mapper/lmk/PrizeClaimRecordMapper.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/PrizeClaimRecordMapper.xml b/framework/src/main/resources/mapper/lmk/PrizeClaimRecordMapper.xml
index 05c0231..76c669a 100644
--- a/framework/src/main/resources/mapper/lmk/PrizeClaimRecordMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/PrizeClaimRecordMapper.xml
@@ -13,6 +13,7 @@
<result column="user_id" property="userId" />
<result column="nick_name" property="nickName" />
<result column="claim_status" property="claimStatus" />
+ <result column="material" property="material"/>
</resultMap>
@@ -49,6 +50,7 @@
LPCR.user_id,
LPCR.nick_name,
LPCR.claim_status,
+ LPCR.material,
LPCR.id
FROM
lmk_prize_claim_record LPCR
@@ -57,6 +59,9 @@
<if test="query.storePrizeId !=null and query.storePrizeId !=''">
AND LPCR.store_prize_id = #{query.storePrizeId}
</if>
+ <if test="query.storeId !=null and query.storeId !=''">
+ AND LPCR.store_id = #{query.storeId}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0