Conflicts:
	src/views/activityInformation/details.vue
	src/views/activityInformation/index.vue
	src/views/personalCenter/components/AffiliatedEnterprises.vue
	src/views/personalCenter/components/AffiliatedEnterprisesUpdate.vue
	vue.config.js