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

app/admin/controller/OrderImport.php

@@ -348,7 +348,7 @@ class OrderImport extends Base
 
             $good_platform_info = Db::name('good_platform')
                 ->field('id,spuCode,platform_code,skuCode,plat_code')
-                ->where(['is_del' => 0, 'plat_code' => $param['plat_code'], 'platform_code' => $param['platform_id']])
+                ->where(['is_del' => 0, 'plat_code' => $param['plat_code'], 'platform_code' => $param['platform_id'], 'exam_status' => 6])//exam_status==6 已上线
                 ->find();
 
             //商品信息