# Conflicts:
#	src/api/ecw/order.js
#	src/api/ecw/orderException.js
#	src/components/ImageAndVideoUpload/index.vue
#	src/i18n/languages/en_US.json
#	src/utils/dict.js
#	src/views/ecw/box/indexSea.vue
#	src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
#	src/views/ecw/customer/edit.vue
#	src/views/ecw/financial/creatCollection.vue
#	src/views/ecw/order/components/PrintTag.vue
#	src/views/ecw/order/detail.vue
#	src/views/ecw/order/exception/index.vue
#	src/views/ecw/order/pending.vue
#	src/views/ecw/order/prepayDeal.vue
#	src/views/ecw/order/splitApply/index.vue
#	src/views/ecw/order/warehousing/components/Warehouse.vue
#	src/views/ecw/order/warehousing/index.vue
#	src/views/ecw/productPrice/edit.vue
#	src/views/ecw/warehouse/index.vue