# Conflicts:
#	server/config.js
#	server/router.js
#	src/pages/Withdrawal/Examine/index.less
#	src/router/index.js

Release activity

See merge request bp/op-web-service!21

# Conflicts:
#	src/pages/Groupmeal/Distrib/index.vue

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

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

# Conflicts:
#	server/controllers/groupmeal.js
#	server/router.js
#	src/pages/Groupmeal/Distrib/index.vue
#	src/service/Groupmeal/groupmeal.js