# Conflicts:
#	src/views/ecm/list.vue

# Conflicts:
#	index.html
#	src/views/ecm/form.vue
#	src/views/ecm/marketing-event/index.vue

Feature/门店签到需求

See merge request !152

# Conflicts:
#	src/views/ecm/form.vue

# Conflicts:
#	index.html
#	src/router/routes.js