Merge branch 'score_shop' into api_score_meger

Helius

2021-12-30 a282114c4ef2ae2d93df39bad14889b896fbdf80

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