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

jyy

2021-04-14 6ada97d503bd93722c081b66a9adcce7599e5536

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

@@ -9,9 +9,9 @@
        FROM
        activity_sign_record a
        where
            a.actId = #{actId}
            and a.open_id = #{userId}
            and a.sign_time like concat('%',#{format},'%')
            a.activity_id = #{actId}
            and a.user_id = #{userId}
            and a.sign_time like concat('%',DATE(#{format}),'%')
    </select>

</mapper>