# Conflicts:
#	server/config.js
#	src/App.vue
#	src/main.js
#	src/router/index.js
#	src/store/index.js
#	src/utils/request.js
#	vue.config.js

Merge branch 'feature/activity' of https://git.yidian-inc.com:8021/bp/op-web-service into feature/activity

# Conflicts:
#	package-lock.json
#	server/config.js
#	server/router.js
#	src/pages/Groupmeal/Distrib/index.vue
#	src/router/index.js

# Conflicts:
#	package-lock.json
#	server/config.js
#	server/router.js
#	server/utils/request.js
#	src/App.vue
#	src/pages/Goods/Detail/index.vue
#	src/pages/Groupmeal/Distrib/index.vue
#	src/router/index.js

# Conflicts:
#	package-lock.json
#	server/config.js
#	server/router.js
#	server/utils/request.js
#	src/App.vue
#	src/pages/Goods/Detail/index.vue
#	src/pages/Groupmeal/Distrib/index.vue
#	src/router/index.js

Merge branch 'feature/activity' of https://git.yidian-inc.com:8021/bp/op-web-service into feature/activity