# Conflicts:
#	server/config.js
#	server/router.js
#	src/pages/Goods/Detail/index.vue
#	src/pages/Goods/Retail/index.vue
#	src/router/index.js