# Conflicts:
#	.env.development
#	src/utils/request.js
#	src/views/system/asset/withdraw/index.vue
#	src/views/system/goodsnew/add/components/goodsspecifications.vue
#	src/views/system/goodsnew/add/components/guide.vue