Merge branch 'developer'

姜友瑶

2022-05-17 b63b60288025c131b7d6023d444417ab5b35e2c1

 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>