Merge branch 'developer' into alpha

Helius

2022-03-15 1c04c6a9607b7d4543989c73a1ae91274bbb167c

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