Merge branch 'score_shop' into api_score_meger

jyy

2021-04-20 e09449ffcf303f67f5bbd168383b285600a251ec

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

@@ -14,4 +14,14 @@
            and a.sign_time like concat('%',DATE(#{format}),'%')
    </select>

    <select id="selectRecordByMonth" resultType="com.matrix.system.shopXcx.api.vo.ActivitySignRecordVo">
        SELECT
            *
        FROM
            activity_sign_record a
        where a.sign_time like concat('%',DATE_FORMAT(#{date},'%Y-%m'),'%')
          and a.activity_id = #{actId}
          and a.user_id = #{userId}
    </select>

</mapper>