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

app/admin/controller/After.php

@@ -1251,6 +1251,7 @@ class After extends Base
             ->field('g.*,gp.skuCode')
             ->join('good_platform gp', 'gp.spuCode=g.spuCode AND gp.exam_status=6')
             ->where('g.spuCode', $spuCode)
+            ->where('gp.skuCode', $old_sale['skuCode'])
             ->find();
 
         if (empty($goodinfo)) return error_show(1005, '查不到这个商品，或该商品已下线无法售后');