Merge remote-tracking branch 'origin/master'

lin

2024-03-16 6195b0dadf2a2d9d433d9059a20a53b702297bee

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

@@ -50,7 +50,10 @@
                          @Param("regionChildCodesList") List<String> regionChildCodesList,
                          @Param("isAdministrator") Integer isAdministrator);

   Integer selectTaskCount(TaskVO task);
   Integer selectTaskCount(@Param("task") TaskVO task,
                     @Param("regionChildCodesList") List<String> regionChildCodesList,
                     @Param("isAdministrator") Integer isAdministrator,
                     @Param("gridCodeList") List<String> gridCodeList);


   List<TaskVO> getBailReportingPage(IPage<TaskVO> page, TaskVO task);