修改参数

app/controller/User.php

@@ -101,7 +101,7 @@ class User extends BaseController
         // 获取输入数据
         $data = Request::only([
             'user_name', 'nick_name', 'password', 'phone', 
-            'user_role', 'white_list_ip'
+            'user_role/d', 'white_list_ip'
         ]);
         $data['merchant_id'] = $userInfo['merchant_id'];
 
@@ -167,7 +167,7 @@ class User extends BaseController
         
         $total = UserModel::where($where)->count();
         $list = UserModel::where($where)
-            ->field('user_id, user_name, nick_name, phone, user_role, merchant_id, white_list_ip, create_time, login_time, update_time')
+            ->field('user_id, user_name, nick_name, phone, user_role, white_list_ip, create_time, login_time, update_time')
             ->order('user_id', 'desc')
             ->page($page, $limit)
             ->select();
@@ -251,7 +251,7 @@ class User extends BaseController
         
         // 获取更新数据
         $data = Request::only([
-            'nick_name', 'phone', 'password', 'user_role', 'white_list_ip'
+            'nick_name', 'phone', 'password', 'user_role/d', 'white_list_ip'
         ]);
         
         // 过滤空值