Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 a2d8b47677fcf9eff87faff1bb89a8674714ddd7

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

@@ -24,4 +24,15 @@
          and a.user_id = #{userId}
    </select>

    <select id="selectListByActIdAndUserIdLikesignTime" resultType="com.matrix.system.activity.entity.ActivitySignRecord">
        SELECT
            *
        FROM
            activity_sign_record a
        where
            a.activity_id = #{actId}
          and a.user_id = #{userId}
          and a.sign_time like concat('%',DATE(#{format}),'%')
</select>

</mapper>