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

app/admin/controller/Goodup.php

@@ -100,7 +100,7 @@ class Goodup extends Base
                 $condit[] =['b.exam_status',"<>",6];
             }
           $sta =Db::name("good_basic")->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where($condit)
-              ->group("spuCode")->column('spuCode');
+              ->group("a.spuCode")->column('a.spuCode');
             $where[]=["spuCode","in",$sta];
         }