fix：解决冲突

package-lock.json

@@ -467,6 +467,7 @@
         "node": ">=6.9.0"
       }
     },
+<<<<<<< HEAD
     "node_modules/@ctrl/tinycolor": {
       "version": "3.6.1",
       "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
@@ -483,6 +484,8 @@
         "vue": "^3.2.0"
       }
     },
+=======
+>>>>>>> 897d91a9c6208a60428d9db9f9bd4745e1233705
     "node_modules/@esbuild/win32-x64": {
       "version": "0.24.0",
       "resolved": "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz",
@@ -499,6 +502,7 @@
         "node": ">=18"
       }
     },
+<<<<<<< HEAD
     "node_modules/@floating-ui/core": {
       "version": "1.6.8",
       "resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-1.6.8.tgz",
@@ -521,6 +525,8 @@
       "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.2.8.tgz",
       "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig=="
     },
+=======
+>>>>>>> 897d91a9c6208a60428d9db9f9bd4745e1233705
     "node_modules/@jiaminghi/color": {
       "version": "1.1.3",
       "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz",
@@ -694,6 +700,7 @@
       "integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==",
       "dev": true
     },
+<<<<<<< HEAD
     "node_modules/@popperjs/core": {
       "name": "@sxzz/popperjs-es",
       "version": "2.11.7",
@@ -704,6 +711,8 @@
         "url": "https://opencollective.com/popperjs"
       }
     },
+=======
+>>>>>>> 897d91a9c6208a60428d9db9f9bd4745e1233705
     "node_modules/@rollup/pluginutils": {
       "version": "5.1.3",
       "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.1.3.tgz",
@@ -1566,7 +1575,8 @@
     "node_modules/countup.js": {
       "version": "2.8.0",
       "resolved": "https://registry.npmmirror.com/countup.js/-/countup.js-2.8.0.tgz",
-      "integrity": "sha512-f7xEhX0awl4NOElHulrl4XRfKoNH3rB+qfNSZZyjSZhaAoUk6elvhH+MNxMmlmuUJ2/QNTWPSA7U4mNtIAKljQ=="
+      "integrity": "sha512-f7xEhX0awl4NOElHulrl4XRfKoNH3rB+qfNSZZyjSZhaAoUk6elvhH+MNxMmlmuUJ2/QNTWPSA7U4mNtIAKljQ==",
+      "license": "MIT"
     },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
@@ -2037,20 +2047,6 @@
         "node": ">=14.14"
       }
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -3827,6 +3823,10 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmmirror.com/vue-countup-v3/-/vue-countup-v3-1.4.2.tgz",
       "integrity": "sha512-nRC65jBcdgwybxqztgd/WaK8ZN5T9ECPyiCFGYFMewCsvqdRVo1CtpT7JREcPNF837Fgu/izTSFiuzrIGD6w0A==",
+<<<<<<< HEAD
+=======
+      "license": "MIT",
+>>>>>>> 897d91a9c6208a60428d9db9f9bd4745e1233705
       "dependencies": {
         "countup.js": "^2.6.2"
       },