Merge remote-tracking branch 'origin/master'

李林

2023-07-20 5322edbcc5529864aaea26d78289df7a8a36fb77

 user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java

@@ -5,8 +5,10 @@
import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

import javax.annotation.Resource;
import java.util.Map;
import java.util.Objects;