Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 b0b8ca4b383c5c3a2373200ca1872c20ee9ff999

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

@@ -94,9 +94,10 @@
    }

    @Override
    public List<Map<String, Object>> getUserNameAndId() {
    public List<Map<String, Object>>
    getUserNameAndId() {
        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
        wrapper.select(User::getId, User::getName);
        wrapper.select(User::getId, User::getName).eq(User::getType,1);
        return userMapper.selectMaps(wrapper);
    }