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

app/admin/controller/Goodup.php

@@ -529,9 +529,9 @@ class Goodup extends Base
         if($data==false){
             return error_show(1004,"未找到商品数据");
         }
-        $data = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->where("exam_status","<>",8)
+        $is_down = Db::name("good_platform")->where(["spuCode"=>$supcode,"is_del"=>0])->where("exam_status","<>",8)
             ->find();
-        if($data!=false){
+        if($is_down!=false){
             return error_show(1004,"存在未下线商品数据");
         }
         $good_name= isset($this->post['good_name'])&&$this->post['good_name']!="" ? trim($this->post['good_name']):"";