chore: Resolve merge conflicts

This commit is contained in:
vben
2024-07-31 21:26:54 +08:00
parent 4074a88c13
commit 082847c441
44 changed files with 772 additions and 475 deletions

View File

@@ -43,7 +43,7 @@
"@vueuse/core": "^10.11.0",
"naive-ui": "^2.39.0",
"pinia": "2.1.7",
"vue": "^3.4.34",
"vue": "^3.4.35",
"vue-router": "^4.4.0"
}
}