# Conflicts:
#   src/views/os-dataDisplay/index.vue
#   src/views/os-log/index.vue
#   src/views/os-spiderManager/index.vue
#   src/views/os-system/index.vue
#   src/views/os-taskInformation/index.vue
#   src/views/os-taskRecord/index.vue