Merge branch 'dev' into dev-sxb

app/common/repositories/user/UserRepository.php

@@ -859,7 +859,7 @@ class UserRepository extends BaseRepository
     public function changeProFormLevel($id)
     {
         return Elm::createForm(Route::buildUrl('systemUserChangeLevelPro', compact('id'))->build(), [
-            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")->props("原节点人信息")
+            Elm::input('level_account', '节点人（上级）')->required()->placeholder("请填写节点人（上级）手机号")->props(['nickname' => null])
         ])->setTitle('修改用户节点人（上级）');
     }
 

app/controller/admin/user/User.php

@@ -810,7 +810,7 @@ class User extends BaseController
             $spread_message = ['uid' => null, 'account' => '无推荐人', 'nickname' => '无推荐人'];
         }
         $formData['value'] = $spread_message['account'];
-        $formData['rule'][0]['props']['uid'] = $spread_message['nickname'];
+        $formData['rule'][0]['props']['nickname'] = $spread_message['nickname'];
         return app('json')->success($formData);
     }