no message

2025-02-20 19:19:59 +08:00
parent cc70fe2405
commit 0e1e9f79cc
425 changed files with 3823 additions and 86265 deletions
--- a/package.json
+++ b/package.json
@@ -21,7 +21,11 @@
  },
  "dependencies": {
    "@element-plus/nuxt": "^1.1.1",
+<<<<<<< HEAD
    "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7",
+=======
+    "@popperjs/core": "^2.11.8",
+>>>>>>> parent of 1d74a9f (no message)
    "axios": "^1.6.2",
    "dayjs": "latest",
    "masonry-layout": "^4.2.2",