# Conflicts:
#	src/i18n/languages/en_US.json
#	src/utils/dict.js
#	src/views/bpm/processInstance/detail.vue
#	src/views/ecw/customer/addPotentialCustom.vue
#	src/views/ecw/customer/components/customer-handover-details.vue
#	src/views/ecw/customer/edit.vue
#	src/views/ecw/customer/index.vue
#	src/views/ecw/customer/transferCustomer.vue
#	src/views/ecw/customerConfirm/index.vue
#	src/views/ecw/order/edit.vue
#	src/views/ecw/order/exception/index.vue
#	src/views/ecw/order/feeApplication.vue