Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/admin/route/app.php

@@ -777,5 +777,4 @@ route::rule('child_out_list', 'admin/OrderOutChild/getListByOutCode');//根据
 route::rule('child_out_get_list', 'admin/OrderOutChild/getList');//根据发货单号获取发货工单列表()
 
 
-route::rule('order_cancel', 'admin/Sale/orderCancel');//订单取消
-
+route::rule('order_cancel', 'admin/Sale/orderCancel');//订单取消