Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-27 c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf

 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java

@@ -74,7 +74,7 @@
    }

    @Override
    public List<User> selectUser() {
    public List<Map> selectUser() {
        return userMapper.selectUser();
    }