Merge branch 'score_shop' into api_score_meger

jyy

2021-04-26 ebbe59b6ee3378fa296441cabe8bb81b2bc200b5

 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