From 8c7508388bad1234b731e0fc59afa095db0fda1b Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 16 May 2021 06:24:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
index 868f5e3..d15125a 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
@@ -15,11 +15,14 @@
c.award_type awardType,
c.award_name awardName,
c.coupon_name couponName,
+ c.score_cnt scoreCnt,
+ d.act_type actType,
c.award_rule awardRule
FROM
activity_sign_receive_record a
LEFT JOIN sys_vip_info b ON a.user_id = b.id
LEFT JOIN activity_sign_award_set c ON a.award_id = c.id
+ LEFT JOIN shop_activities d ON a.award_id = d.id
<where>
a.company_id = #{record.companyId}
and a.activity_id = #{record.actId}
--
Gitblit v1.9.1