From 77dbb85286de0ec52d8144bb7c89483c2909a07e Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 21 Jul 2020 15:31:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

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

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
index 4f03084..a4f180f 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
@@ -70,8 +70,8 @@
                     return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                 } },
                 { align: 'center', width: 200, toolbar: '#feeedback-table-bar', title: '操作' }
-            ]],done:function(){
-                permissionsInput();
+            ]],done:function(res){
+                permissionsInput(res,config);
             }
         });
 

--
Gitblit v1.8.0