合并冲突

2026-05-28 03:09:24 +08:00 · 2025-09-09 09:52:52 +08:00
parent 6c76d1e980 2f602ad72a
commit 5a11916a02
70 changed files with 3979 additions and 846 deletions
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -60,7 +60,9 @@ export const routes = [
          {
            name: 'permission',
            path: 'permission',
-            title: '权限管理'
+            title: '权限管理',
+            component: () =>
+              import(/* webpackChunkName: "system" */ '@/views/system/permission.vue')
          },
          {
            name: 'station',