# Conflicts: # xichongSys/src/http/axios.js # xichongSys/src/main.js # xichongSys/src/router/index.js # xichongSys/src/utils/global.js # xichongSys/src/views/Core/candode.vue