Merge remote-tracking branch 'origin/master'

rain

2026-01-23 019f3dd14f140a3381aec0bb696e3a84f76c45e4

 drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.java

@@ -17,11 +17,13 @@
package org.sxkj.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.sxkj.common.node.TreeStringNode;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.param.DeptPageParam;
import org.sxkj.system.vo.DeptVO;

import java.util.List;
@@ -116,4 +118,12 @@

   String getFullRegionName(String areaCode);
   String getSingleRegionName(String areaCode);

   /**
    *
    * @param page
    * @param deptPageParam
    * @return
    */
    IPage<DeptVO> selectDeptPage(IPage<DeptVO> page, DeptPageParam deptPageParam);
}