Merge branch 'dev-wgg' of wugg/cxinv into dev

app/admin/controller/Stat.php

@@ -209,7 +209,7 @@ class Stat extends BaseController{
 		$list = Db::name("qrd_info")
 		          ->where([["createdTime","<=",date("Y-m-d H:i:s",time()-180*24*3600)],["companyNo","=",$post['companyNo']],["wpay_fee",">",0],["platform_type","=",1]])
 		          ->field("sequenceNo,if(cxCode='',sequenceNo,cxCode) cxCode,createdTime,customerName,department,ownerName,goodName,goodNum,goodPrice,totalPrice,apay_fee,wpay_fee,ainv_fee,winv_fee,inv_fee,
-		apay_fee-ainv_fee ainv_wpay,datediff(now(),createdTime) dz_day,pay_status,inv_status,sendStatus")
+		wpay_fee-winv_fee ainv_wpay,datediff(now(),createdTime) dz_day,pay_status,inv_status,sendStatus")
 		          ->select();
 		return app_show(0,"获取成功",$list);
 	}

app/command/CopySupplier.php

@@ -108,7 +108,7 @@ class CopySupplier extends Command
              ];
 			$data=array_merge($comp,$datas);
 		}
-		Db::name("company_info")->save($data);
+		Db::name("customer_info")->save($data);
     }
 
      private function checkSupplier($supplier){