Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/iot

# Conflicts: # src/router/modules/remaining.ts
2025-07-25 16:25:07 +08:00 · 2024-09-07 20:43:14 +08:00
parent e5de6a5cbd 3c34602483
commit daddf79683
247 changed files with 5378 additions and 2660 deletions
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@ -589,12 +589,21 @@ const remainingRouter: AppRouteRecordRaw[] = [
        meta: {
          title: '绘图作品',
          icon: 'ep:home-filled',
-          noCache: false,
-          affix: true
+          noCache: false
        }
      }
    ]
  },
+  {
+    path: '/:pathMatch(.*)*',
+    component: () => import('@/views/Error/404.vue'),
+    name: '',
+    meta: {
+      title: '404',
+      hidden: true,
+      breadcrumb: false
+    }
+  },
  {
    path: '/iot',
    component: Layout,