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/opration/sysOrganization.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html
index 55df504..81bdbde 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html
@@ -150,8 +150,8 @@
                     { field: 'enabled', align: 'right', sort: true, templet: '#organization-tpl-state', title: '状态' },
                     { toolbar: '#organization-table-bar', align: 'right', align: 'center', title: '操作' }
                 ]],
-                done: function () {
-                    permissionsInput();
+                done: function (res) {
+                    permissionsInput(res,config);
                 }
             });
         };

--
Gitblit v1.8.0