Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

9 天以前 b0a4de74b47e2626f51eb4a844db3e62f6a4bf9d

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java

@@ -68,4 +68,10 @@
        return Result.success( userService.updateUserName(object));
    }

    @ApiOperation("用户登录记录")
    @PostMapping("/getUserLog")
    public Result getUserLog(){
        return Result.success( userService.getUserLog());
    }

}