Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-19 d0a6fc23f31f924cb1744397478dc4c7c57c04e1

 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错误！");