From 92329c6daeeb4d369459bfd9ad6b1d2d20b06300 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 28 Apr 2021 15:16:14 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml | 2 ++ 1 files changed, 2 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 2237f08..221ca35 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml @@ -14,6 +14,8 @@ c.cumulative_day cumulativeDay, c.award_type awardType, c.award_name awardName, + c.coupon_name couponName, + c.score_cnt scoreCnt, c.award_rule awardRule FROM activity_sign_receive_record a -- Gitblit v1.9.1