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

935090232@qq.com

2021-10-25 7af9aaa4ef6736d407cc3cbe03beddb8dfd57fe9

 zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java

@@ -21,4 +21,7 @@
         @Param("userId")Long userId, @Param("format")Date format);

    List<ActivitySignRecordVo> selectRecordByMonth(@Param("actId")Long actId, @Param("userId")Long userId, @Param("date") DateTime date);

   List<ActivitySignRecord> selectListByActIdAndUserIdLikesignTime(@Param("actId")long actId,
                                                    @Param("userId")Long userId, @Param("format")Date format);
}