Merge remote-tracking branch 'origin/master'

lin

2024-04-15 bdcca1cd1f1c4c5d7d187d74a7c75f1caac8b491

 src/main/java/org/springblade/modules/task/service/ITaskResidencePermitApplyService.java

@@ -54,7 +54,7 @@
    * @param i
    * @return
    */
   Integer getCount(String neiCode, int i);
   Integer getCount(String neiCode, int status);

   /**
    * 审核