# Conflicts:
#	.env.development
#	src/utils/request.js
#	src/views/system/goods/add/index.vue

hxz_dev  合并 到  test分支，冲突解决