Merge remote-tracking branch 'origin/master'

linwe

2023-11-24 8a28bb397d5743edf1da5930db0d6d0fdd86b35e

 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java

@@ -41,7 +41,9 @@
    * @param taskReportForRepairs
    * @return
    */
   List<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage page,@Param("vo") TaskReportForRepairsVO taskReportForRepairs);
   List<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage page,
                                                @Param("vo") TaskReportForRepairsVO taskReportForRepairs,
                                                @Param("list") List<String> list);


   /**
@@ -50,4 +52,6 @@
    * @return
    */
    TaskReportStatistics getStatisticsCount(@Param("userId") Long userId);

    Integer getStatistics(Long userId);
}