From 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Wed, 15 Jul 2020 09:48:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html index bcdfd79..410386c 100644 --- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html +++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html @@ -60,7 +60,7 @@ elem: '#user-table', url: config.base_server + 'api-user/users', method: 'GET', - headers: { 'Authorization': 'Bearer ' + config.getToken().access_token }, + headers: { 'Authorization': 'Bearer ' + config.getToken().access_token}, page: true, cols: [[ { field: 'id', sort: true, width: 200, title: '标识' }, @@ -81,8 +81,8 @@ { field: 'enabled', width: 100, sort: true, templet: '#user-tpl-state', title: '状态' }, { fixed: 'right', align: 'center', toolbar: '#user-table-bar', title: '操作', width: 300 } ]], - done:function(){ - permissionsInput(); + done:function(res){ + permissionsInput(res,config); } }); -- Gitblit v1.8.0