vertoryao
|
309dffa60b
|
Merge remote-tracking branch 'origin/develop' into feature/device
# Conflicts:
# .env.development
# .eslintrc.js
# components.d.ts
# config/vite.config.dev.ts
# index.html
# package.json
# pnpm-lock.yaml
# src/api/authority.ts
# src/api/dept.ts
# src/api/interceptor.ts
# src/api/message.ts
# src/api/role.ts
# src/api/user.ts
# src/assets/world.json
# src/components/breadcrumb/index.vue
# src/components/footer/index.vue
# src/components/menu/index.vue
# src/components/message-box/index.vue
# src/components/message-box/list.vue
# src/components/navbar/index.vue
# src/components/tab-bar/readme.md
# src/components/tab-bar/tab-item.vue
# src/config/settings.json
# src/directive/permission/index.ts
# src/hooks/permission.ts
# src/locale/en-US.ts
# src/locale/zh-CN.ts
# src/mock/index.ts
# src/router/guard/permission.ts
# src/router/guard/userLoginInfo.ts
# src/router/routes/modules/dashboard.ts
# src/router/routes/modules/system.ts
# src/router/routes/modules/user.ts
# src/store/index.ts
# src/store/modules/auth/index.ts
# src/store/modules/auth/type.ts
# src/store/modules/user/index.ts
# src/store/modules/user/types.ts
# src/utils/excel.ts
# src/views/dashboard/workplace/components/banner.vue
# src/views/dashboard/workplace/components/data-panel.vue
# src/views/dashboard/workplace/index.vue
# src/views/dashboard/workplace/locale/en-US.ts
# src/views/dashboard/workplace/locale/zh-CN.ts
# src/views/exception/403/index.vue
# src/views/exception/404/index.vue
# src/views/exception/500/index.vue
# src/views/login/components/banner.vue
# src/views/login/components/login-form.vue
# src/views/login/index.vue
# src/views/login/locale/en-US.ts
# src/views/login/locale/zh-CN.ts
# src/views/system/authority/components/auth-edit.vue
# src/views/system/authority/components/auth-table.vue
# src/views/system/authority/index.vue
# src/views/system/authority/locale/en-US.ts
# src/views/system/authority/locale/zh-CN.ts
# src/views/system/dept/components/dept-edit.vue
# src/views/system/dept/index.vue
# src/views/system/dept/locale/en-US.ts
# src/views/system/dept/locale/zh-CN.ts
# src/views/system/permission/index.vue
# src/views/system/role/components/role-edit.vue
# src/views/system/role/index.vue
# src/views/system/role/locale/en-US.ts
# src/views/system/role/locale/zh-CN.ts
# src/views/system/user/components/user-edit.vue
# src/views/system/user/index.vue
# src/views/system/user/locale/en-US.ts
# src/views/system/user/locale/zh-CN.ts
# src/views/user/setting/components/basic-information.vue
# src/views/user/setting/components/password-reset.vue
# src/views/user/setting/components/user-panel.vue
# src/views/user/setting/index.vue
# src/views/user/setting/locale/en-US.ts
# src/views/user/setting/locale/zh-CN.ts
|
2024-12-27 10:32:25 +08:00 |
|
