# Conflicts:
#	src/views/ecw/order/index.vue
#	src/views/ecw/order/warehousing/components/Warehouse.vue