From 0a12bc6ec7148ae33596e9de142027ec379c7835 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 09 Apr 2024 10:11:50 +0800 Subject: [PATCH] Merge branch 'blnka' into blnka-vip --- src/main/resources/mapper/modules/MallVipConfigMapper.xml | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/modules/MallVipConfigMapper.xml b/src/main/resources/mapper/modules/MallVipConfigMapper.xml index 111b17c..a5a4069 100644 --- a/src/main/resources/mapper/modules/MallVipConfigMapper.xml +++ b/src/main/resources/mapper/modules/MallVipConfigMapper.xml @@ -22,9 +22,13 @@ <result property="scoreMultiple" column="score_multiple" /> <result property="gainType" column="gain_type" /> <result property="isShow" column="is_show" /> + <result property="type" column="c_type" /> <collection property="details" ofType="cc.mrbird.febs.vip.entity.MallVipBenefitsDetails"> <id property="id" column="d_id" /> + <id property="content" column="d_content" /> + <id property="linkType" column="d_link_type" /> + <id property="isClick" column="d_is_click" /> </collection> </collection> </resultMap> @@ -56,6 +60,11 @@ ,benefits.icon c_icon ,benefits.score_multiple ,benefits.gain_type + ,benefits.type c_type + ,details.id d_id + ,details.content d_content + ,details.link_type d_link_type + ,details.is_click d_is_click from mall_vip_config config inner join mall_vip_config_benefits configBenefits on config.id=configBenefits.config_id inner join mall_vip_benefits benefits on configBenefits.benefits_id=benefits.id -- Gitblit v1.9.1