Merge remote-tracking branch 'origin/dev' into dev

src/components/FuncManager/AddFunc.js

@@ -54,7 +54,7 @@ function AddUser(props) {
     const formData = form.getFieldValue()
     let params = values
     params.parentId = formData.parentId
-    params.permissions = formData.permissions?formData.permissions.split(','):''
+    params.permissions = formData.permissions?formData.permissions.split(','):[]
     if (type == 2 || type == 4) {
       params.id = id
       updateMenu(params)