Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-09 f96ad6ec73b3da7df5c08471f0d567d46fc767e8

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

@@ -10,12 +10,14 @@
      a.id id,
      b.nick_name nickName,
      a.receive_time reciveTime,
      a.state,
      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}