Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Report.php

@@ -1149,7 +1149,6 @@ class Report extends Base
 
     //【七、商品报表】1.商品上线报表_列表
     public function GoodOnlineList()
-
     {
         $param = $this->request->only([
             'token',
@@ -1193,7 +1192,7 @@ class Report extends Base
 
         $data = [];
         foreach ($list as $value) {
-            $value['company_name'] = get_company_name_by_uid($value['createrid']);;
+            $value['company_name'] = get_company_name_by_uid($value['createrid']);
             $value['good_model'] = Db::name('good_spec')
                 ->alias('gp')
                 ->field('')

app/admin/controller/Sale.php

@@ -3689,7 +3689,7 @@ class Sale extends Base
             }else{
                 $standing_book_da = array_merge($standing_book_da, [
                     'orderCode' => $outinfo['orderCode'],
-                    'cgdNo' => $QrdCgd['cgdNo'],
+                    'cgdNo' => $cgdinfo['cgdNo'],
                     'spuCode' => $outinfo['spuCode'],
                     'order_type' => $QrdCgd['order_type'],
                     'order_source' => $QrdCgd['order_source'],