ソースを参照

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

wugg 3 年 前
コミット
60cac661db
1 ファイル変更1 行追加1 行削除
  1. 1 1
      app/admin/controller/Sale.php

+ 1 - 1
app/admin/controller/Sale.php

@@ -1592,7 +1592,7 @@ class Sale extends Base
             $einfo['supplierName'] = isset($supplier['company']) ? $supplier['company'] : "";
         }
         $fo = Db::name('order_addr')->alias("a")->leftJoin("order_out b","a.id=b.addrid")
-            ->where(['a.orderCode' => $einfo['orderCode'], 'a.is_del' => 0,"b.is_del"=>0])->field("a.*,b.post_name,b.post_code,
+            ->where(['a.orderCode' => $einfo['orderCode'], 'a.is_del' => 0])->field("a.*,b.post_name,b.post_code,
             b.post_fee,b.sendtime,b.send_num,b.check_num,b.error_num,b.wsm_code,b.order_type,b.status as send_status,b.outCode")
             ->select();
         $addrs = [];