Merge remote-tracking branch 'origin/master'

linwe

2023-12-23 9b8cf1c18a25f2322791a7d2fd268b42f2e01fa1

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

@@ -63,5 +63,5 @@
    */
   int updateView(GridmanEntity gridman);

   Integer getReportForStatistics(String code, Long userId, Integer status,Integer type);
   Integer getReportForStatistics(String code, Long userId, Integer status, Integer type, String roleType);
}