chore: Resolve merge conflicts

2024-07-31 21:26:54 +08:00
parent 4074a88c13
commit 082847c441
44 changed files with 772 additions and 475 deletions
--- a/packages/effects/request/package.json
+++ b/packages/effects/request/package.json
@@ -22,8 +22,7 @@
  "dependencies": {
    "@vben/locales": "workspace:*",
    "@vben/utils": "workspace:*",
-    "axios": "^1.7.2",
-    "vue-request": "^2.0.4"
+    "axios": "^1.7.2"
  },
  "devDependencies": {
    "axios-mock-adapter": "^1.22.0"