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

jyy

2021-04-09 63170eb558babf81890cb23a453680e1054ecf85

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

@@ -87,7 +87,7 @@
      FROM
      activity_sign_receive_record a
      left join biz_user b on a.user_id= b.user_id
      where a.user_id = #{userId} and a.id = #{receiveId}
      where a.user_id = #{userId} and a.award_id = #{receiveId}
   </select>

</mapper>