# Conflicts:
#	server/utils/request.js
#	src/pages/Activity/ActivityDetail/index.vue
#	src/pages/Activity/releaseProduc/components/addProduc.vue
#	src/pages/Activity/releaseProduc/components/infoEditing.vue
#	src/pages/Activity/releaseProduc/components/myMap.vue
#	src/pages/Activity/releaseProduc/index.vue
#	src/pages/Goods/Detail/index.vue
#	src/utils/util.js