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

@@ -23,6 +23,6 @@
"@vben/preferences": "workspace:*",
"@vueuse/core": "^10.11.0",
"echarts": "^5.5.1",
"vue": "^3.4.34"
"vue": "^3.4.35"
}
}