Merge remote-tracking branch 'origin/master'

lin

2024-03-14 cae3b043d8a8a08e176839d0c23a4432e5d9f5f4

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

@@ -18,6 +18,7 @@

import org.apache.ibatis.annotations.Param;
import org.springblade.modules.task.entity.TaskResidencePermitApplyEntity;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.vo.TaskResidencePermitApplyVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -38,7 +39,11 @@
    * @param taskResidencePermitApply
    * @return
    */
   List<TaskResidencePermitApplyVO> selectTaskResidencePermitApplyPage(IPage page, @Param("residen") TaskResidencePermitApplyVO taskResidencePermitApply);
   List<TaskResidencePermitApplyVO> selectTaskResidencePermitApplyPage(IPage page,
                                                      @Param("residen") TaskResidencePermitApplyVO taskResidencePermitApply,
                                                      @Param("regionChildCodesList") List<String> regionChildCodesList,
                                                      @Param("isAdministrator") Integer isAdministrator,
                                                      @Param("gridCodeList") List<String> gridCodeList);


}