Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-03 a390fec8fd0821ad5e31e335d34de227ef59c65f

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

@@ -1,8 +1,9 @@
package com.ycl.jxkg.mapper;

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;