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

1

app/admin/controller/Sale.php

@@ -3266,8 +3266,6 @@ class Sale extends Base
                                 }
 
                             }
-
-
                         }
 
                     $datainfo = Db::name('order_out')->insert($data,true);