Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

@@ -22,6 +22,7 @@
import org.springblade.modules.task.vo.TaskResidencePermitApplyVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.List;

/**
@@ -46,4 +47,5 @@
                                                      @Param("gridCodeList") List<String> gridCodeList);


   Integer getCount(String neiCode, int i, Long userId);
}