# Conflicts: # src/views/school-center/activity/activityList.vue # src/views/school-center/activity/activityRecord.vue
