Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-09 0c03b83cc8e26963275d9ef16ea476ecdc035a0d

 cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java

@@ -2,12 +2,10 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.DepartmentDto;
import com.yuanchu.mom.dto.UserDto;
import com.yuanchu.mom.pojo.Department;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.pojo.User;
import org.apache.ibatis.annotations.Param;

import java.util.List;