From 3c470b15b952b86c1e38cb9634190a12ccf3d38d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 22 Jul 2020 15:32:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
index 90bec11..1501a0b 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
@@ -54,7 +54,7 @@
 
         // 获取所有角色
         layer.load(2);
-        admin.req('api-user/allRoles', {}, function (data) {
+        admin.req('api-user/findByMap', {}, function (data) {
             layer.closeAll('loading');
             if (0 == data.code) {
                 // 渲染多选下拉框

--
Gitblit v1.8.0