From 6bd24fb0861a1a89cb01ad5614a1d0e31eb6ceba Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Jan 2024 14:56:49 +0800
Subject: [PATCH] Merge branch 'blnka-vip' of http://120.27.238.55:7000/r/xc-mall into blnka-vip
---
src/main/resources/mapper/modules/MallVipBenefitsMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallVipBenefitsMapper.xml b/src/main/resources/mapper/modules/MallVipBenefitsMapper.xml
index a2e5d7d..ce44de8 100644
--- a/src/main/resources/mapper/modules/MallVipBenefitsMapper.xml
+++ b/src/main/resources/mapper/modules/MallVipBenefitsMapper.xml
@@ -6,8 +6,9 @@
<id property="id" column="id" />
<result property="name" column="name" />
<result property="type" column="type" />
+ <result property="gainType" column="gain_type" />
<result property="icon" column="icon" />
- <result property="multiple" column="multiple" />
+ <result property="scoreMultiple" column="score_multiple" />
<result property="remark" column="remark" />
<collection property="details" ofType="cc.mrbird.febs.vip.entity.MallVipBenefitsDetails">
@@ -16,6 +17,7 @@
<result property="isClick" column="is_click" />
<result property="linkType" column="link_type" />
<result property="content" column="content" />
+ <result property="benefitsId" column="benefits_id" />
<result property="seq" column="seq" />
</collection>
</resultMap>
@@ -34,7 +36,7 @@
,benefitsDetail.content
,benefitsDetail.seq
from mall_vip_benefits benefits
- inner join mall_vip_benefits_details benefitsDetail on benefits.id=benefitsDetail.benefitsId
+ left join mall_vip_benefits_details benefitsDetail on benefits.id=benefitsDetail.benefits_id
where benefits.id=#{id}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1