Merge branch 'ty_fix' into alpha

Helius

2021-11-08 64944a0dfd639a5c335d22f8230a64bf875f284f

 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);
}