Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-26 30f6da8bf0143906b42fa600f6a604cea6c81f71

 user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java

@@ -97,7 +97,6 @@
        if (!ObjectUtils.isEmpty(o)){
            unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(o), Map.class);
            Map<String, String> map = userService.selectUserByUserId((Integer) unmarshal.get("id"));
            MyUtil.PrintLog(map.toString());
            return Result.success(map);
        }
        return Result.fail("Token错误！");