Merge branch 'master' of http://git.liuniu946.com/zxhxx/gp

app/admin/controller/user/User.php

@@ -333,7 +333,7 @@ class User extends AuthController
         $f[] = Form::input('card_id', '身份证号', $user->getData('card_id'));
         $f[] = Form::textarea('mark', '用户备注', $user->getData('mark'));
         $f[] = Form::radio('is_promoter', '推广员', $user->getData('is_promoter'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '关闭']]);
-        $f[] = Form::input('spread_uid', '上级编号', $user->getData('spread_uid'));
+        //$f[] = Form::input('spread_uid', '上级编号', $user->getData('spread_uid'));
         $f[] = Form::radio('status', '状态', $user->getData('status'))->options([['value' => 1, 'label' => '开启'], ['value' => 0, 'label' => '锁定']]);
         $form = Form::make_post_form('添加用户通知', $f, Url::buildUrl('update', array('uid' => $uid)), 5);
         $this->assign(compact('form'));