conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml

@@ -16,11 +16,13 @@
      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}