Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -47,5 +47,7 @@
                                                      @Param("gridCodeList") List<String> gridCodeList);


   Integer getCount(String neiCode, int i, Long userId);
   Integer getCount(String neiCode, int i, Long userId,@Param("regionChildCodesList") List<String> regionChildCodesList,
                @Param("isAdministrator") Integer isAdministrator,
                @Param("gridCodeList") List<String> gridCodeList);
}