提交 5213a7e5 编写于 作者: 刘英杰's avatar 刘英杰

Merge branch 'pc' of http://git.neaic.com/A00051/museumappointment-web

# Conflicts:
#	.gitignore
#	dist.zip
#	src/App.vue
#	src/pages/officialReception/index.vue
#	src/pages/systemConfiguration/addAdministrator.vue
#	src/pages/systemConfiguration/background.vue
#	src/pages/systemConfiguration/dateManagement.vue
#	src/pages/systemConfiguration/entryRecord.vue
#	src/pages/systemConfiguration/notice.vue
#	src/pages/systemConfiguration/numberLimit.vue
#	src/pages/systemConfiguration/scanCodePeopleManagement.vue
#	src/pages/teamAppointment/index.vue
#	src/pages/welcome/index.vue
#	src/router/index.js
112
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或