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

chenlu

昨天 3247273b3505b42c400251ee2fc0921affaadf40

 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());
    }

}