Merge branch 'dev' into plm

app/admin/controller/WareHouse.php

@@ -229,6 +229,15 @@ class WareHouse extends BaseController
         if($contactor==''){
             return error_show(1004,'参数contactor 不能为空');
         }
+        $contactor = isset($post['contactor'])&& $post['contactor']!='' ?trim($post['contactor']) :'';
+        if($contactor==''){
+            return error_show(1004,'参数contactor 不能为空');
+        }
+        $contactorinfo = GetInfoById($post['token'],['id'=>$contactor]);
+        if(!empty($contactorinfo) && $contactorinfo['code']!=0){
+            return error_show($contactorinfo['code'],$contactorinfo['message']);
+        }
+        $nickname = $contactorinfo['data']['nickname'];
         $mobile = isset($post['mobile'])&& $post['mobile']!='' ?trim($post['mobile']) :'';
         if($mobile==''){
             return error_show(1004,'参数mobile 不能为空');
@@ -246,6 +255,7 @@ class WareHouse extends BaseController
                 'name'=>$name,
                 'addr'=>$addr,
                 'contactor'=>$contactor,
+                'contactor_name'=>isset($nickname) ?$nickname:"" ,
                 'mobile'=>$mobile,
                 'position'=>$position,
                 "addrs_code"=>json_encode($addrs_code),