# Conflicts: # .gitignore # src/api/crmApi.ts # src/api/usersApi.ts # src/store/modules/user.ts # src/utils/http/index.ts # src/views/auth/login/index.vue # src/views/crmpc/customer/Show.vue # src/views/crmpc/customer/index.vue
# Conflicts: # src/App.vue # src/api/menuApi.ts # src/components/core/layouts/art-header-bar/index.vue # src/router/routes/asyncRoutes.ts # src/router/routesAlias.ts # src/typings/api.d.ts # src/views/system/user-center/index.vue