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

@@ -59,7 +59,10 @@ class SuppliersController extends BaseController
         $token = $action_name. '+' .date('Y-m-d'). '+' .http_build_query($param);
         $param['token'] = md5($token);
         $res = http_post($url,json_encode($param));
-        return $this->success($res);
+        if($res['code'] != 200){
+            $this->response($res['message'],Code::SYSTEM_ERROR);
+        }
+        return $this->success($res['data']);
     }
     /**
      * @remark :按名字搜索公司

@@ -54,7 +54,6 @@ class WebSettingServiceLogic extends BaseLogic
             if(!empty($data)){
                 $this->model->insert($data);
             }
-
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();