Merge branch 'dev-xpy' into dev

app/controller/admin/user/User.php

@@ -805,11 +805,11 @@ class User extends BaseController
 
         $spreadId = Db::name('user')->where('uid', $id)->value('spread_uid');
         if ($spreadId) {
-            $level_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->find();
+            $spread_message = Db::name('user')->where('uid', $spreadId)->field('uid,account,nickname')->find();
         } else {
-            $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
+            $spread_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
         }
-        return app('json')->success(['form' => $formData, 'level_message' => $level_message]);
+        return app('json')->success(array_merge($formData,['spread_message' => $spread_message]));
     }
 
 
@@ -848,7 +848,7 @@ class User extends BaseController
         } else {
             $level_message = ['uid' => null, 'account' => '无节点人', 'nickname' => '无节点人'];
         }
-        return app('json')->success(['form' => $formData, 'level_message' => $level_message]);
+        return app('json')->success(array_merge($formData, ['level_message' => $level_message]));
     }