Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

@@ -160,9 +160,8 @@ class BaseController extends Controller
                         $data['image_link'] = url('/b/image/' . $v);
                         $data['image_link'] = url('/b/image/' . $v);
                         break;
                         break;
                     case 'operator_id':
                     case 'operator_id':
-                        if(!empty($v)){
-                            $data['operator_name'] = (new User())->get_name($v);
-                        }
+                        $data['operator_name'] = '1111';
+                        break;
 
 
                 }
                 }
             }
             }

@@ -127,8 +127,8 @@ class User extends Base
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function get_name($operator_id = ''){
-        $info = $this->read(['operator_id'=>$operator_id],['name']);
-        return $info['name'];
+    public function get_name($data){
+        $info = $this->read(['operator_id'=>$data['operator_id']],['name']);
+        return $info;
     }
     }
 }
 }