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

app/admin/controller/Consult.php

@@ -368,6 +368,7 @@ class Consult extends Base
         $zxinfo['metal_name']=isset($zxinfo['metal_id'])&& $zxinfo['metal_id']!=0?$this->noble[$zxinfo['metal_id']]:"";
         $zxinfo['specinfo']=json_decode($zxinfo['specinfo'],true);
 		$zxinfo['pay_name'] = $zxorder['pay_id']==0?"":Db::name("pay")->where("id",$zxorder['pay_id'])->value("pay_name",'');
+		$zxinfo['pay_id'] = $zxorder['pay_id'];
         if($zxorder['khNo']!==""){
             $kh=Db::name("customer_info")->where(['companyNo'=>$zxorder['khNo']])->find();
             $zxinfo['khname']= isset($kh['companyName'])?$kh['companyName']:"";