# Conflicts:
#	ruoyi-ui/src/views/system/hscj/index.vue
#	ruoyi-ui/src/views/system/ycsb/index.vue
#	ruoyi-ui/src/views/system/yxry/index.vue