Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Consult.php

@@ -900,7 +900,7 @@ class Consult extends Base
                 ->where(['is_del' => 0, 'id' => $zx['platform_code']])
                 ->value('is_select_pay_rate', 0);
             if ($is_select_pay_rate == 1) {
-               if(channel_is_company($zx['platform_code'],$supplierArr['relation_code'])) return  error_show(1004, "平台渠道包含当前业务公司{$supplierNo}");
+               if(channel_is_company($zx['platform_code'],$supplierArr['relation_code'])) return  error_show(1004, "平台渠道包含当前供应商公司{$supplierNo}");
 //                if (!empty($temp)) return json_show(1004, '招标任务平台已存在该供应商，请更换其他供应商');
             }
         }
@@ -1246,7 +1246,7 @@ class Consult extends Base
                 ->where(['is_del' => 0, 'id' => $zx['platform_code'],"status"=>1])
                 ->value('is_select_pay_rate', 0);
             if ($is_select_pay_rate == 1) {
-               if(channel_is_company($zx['platform_code'],$supplierArr['relation_code'])) return  error_show(1004, "平台渠道包含当前业务公司{$supplierNo}");
+               if(channel_is_company($zx['platform_code'],$supplierArr['relation_code'])) return  error_show(1004, "平台渠道包含当前供应商公司{$supplierNo}");
 //
             }
         }