Merge remote-tracking branch 'origin/master'

lin

2024-02-28 92a3b953f2da493e68afb9ae73a15b6513a6c18a

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

@@ -46,7 +46,8 @@
                                                @Param("list") List<String> list,
                                                @Param("regionChildCodesList") List<String> regionChildCodesList,
                                                @Param("isAdministrator") Integer isAdministrator,
                                                @Param("aoiCodeList") List<String> aoiCodeList);
                                                @Param("aoiCodeList") List<String> aoiCodeList,
                                                @Param("gridCodeList") List<String> gridCodeList);


   /**