From 8f7b99b0a3d53f4410e8b1f2f209ce2743f0a944 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 08 Apr 2021 20:14:44 +0800
Subject: [PATCH] 20210408 核销

---
 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 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 c983585..71c76ac 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
@@ -12,10 +12,11 @@
 		a.receive_time reciveTime,
 		c.cumulative_day cumulativeDay,
 		c.award_type awardType,
-		c.award_name awardName
+		c.award_name awardName,
+		c.award_rule awardRule
 		FROM
 		activity_sign_receive_record a
-		LEFT JOIN biz_user b ON a.open_id = b.open_id
+		LEFT JOIN biz_user b ON a.user_id = b.user_id
 		LEFT JOIN activity_sign_award_set c ON a.award_id = c.id
 		<where>
 			a.company_id = #{record.companyId}

--
Gitblit v1.9.1