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

# Conflicts: # pnpm-lock.yaml
2025-08-22 05:51:54 +08:00 · 2024-12-01 15:21:12 +08:00
parent 2de62667dc c79f027d62
commit f2f9391328
10 changed files with 528 additions and 398 deletions
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
    "vue": "3.5.12",
    "vue-dompurify-html": "^4.1.4",
    "vue-i18n": "9.10.2",
-    "vue-router": "^4.3.0",
+    "vue-router": "4.4.5",
    "vue-types": "^5.1.1",
    "vuedraggable": "^4.1.0",
    "web-storage-cache": "^1.1.1",