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