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

app/admin/controller/Sale.php

@@ -1349,8 +1349,12 @@ class Sale extends Base
      * @throws \think\db\exception\ModelNotFoundException
      */
     public function project_good($data){
-        $good=Db::name('good')->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")
-            ->where(["b.skuCode"=>$data['skuCode'],"a.is_del"=>0,"b.is_del"=>0])->field("b.*,a.skuCode,a.platform_code,a.plat_code")->find();
+        $good=Db::name('good')
+            ->alias("a")
+            ->leftJoin("good_platform b","a.spuCode=b.spuCode")
+            ->where(["b.skuCode"=>$data['skuCode'],"a.is_del"=>0,"b.is_del"=>0])
+            ->find();
+
         if($good==false){
             return false;
         }