Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-03 6c87a7ad0ae6ae9b5d8b6ab4d0e5b93169171972

 src/main/java/com/ycl/jxkg/mapper/UserMapper.java

@@ -2,8 +2,8 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.vo.admin.user.UserPageRequestVO;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.vo.admin.user.UserPageRequestVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;