Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/common.php

@@ -1487,7 +1487,7 @@ if(!function_exists("pay_log")){
         	if($payinfo['status']!=1)throw new Exception( "支付渠道已禁用");
         	$supplierArrs =Db::name("pay_rate")->where(["pay_id"=>$pay_id,"status"=>1,"is_del"=>0])->field("pay_id,companyNo,companyName,rate,weight,is_cgd,is_qrd")->select()->toArray();
         	if(empty($supplierArrs)) throw new Exception( "支付渠道未配置");
-        	$supplierArr= array_column("companyNo",$supplierArrs);
+        	$supplierArr= array_column($supplierArrs,"companyNo");
         	if(in_array($companyNo,$supplierArr)) throw new Exception( "支付渠道含有该业务公司，支付渠道无法使用！");
 			$paylog=[];
               foreach ($supplierArrs as $item){