Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-26 30f6da8bf0143906b42fa600f6a604cea6c81f71

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

@@ -5,8 +5,11 @@
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.List;
import java.util.Map;
import java.util.Objects;

@@ -22,4 +25,6 @@
    Map<String, String> selectUserByUserId(int userId);

    IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);

    List<User> selectUser();
}