From 4eac422e52a4d28fb651b75d0f054697c7a2c0fa Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 09 二月 2026 15:14:13 +0800
Subject: [PATCH] 优化

---
 web/package-lock.json |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index e0c9282..eac6b5d 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -4,6 +4,8 @@
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
+<<<<<<< HEAD
+=======
         "@parcel/watcher": {
             "version": "2.5.1",
             "resolved": "https://registry.npmmirror.com/@parcel/watcher/-/watcher-2.5.1.tgz",
@@ -121,6 +123,7 @@
             "dev": true,
             "optional": true
         },
+>>>>>>> eb14fddff37f3783c63deba20f53b37383fba652
         "@types/json-schema": {
             "version": "7.0.11",
             "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz",
@@ -270,6 +273,8 @@
                 "concat-map": "0.0.1"
             }
         },
+<<<<<<< HEAD
+=======
         "braces": {
             "version": "3.0.3",
             "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz",
@@ -280,6 +285,7 @@
                 "fill-range": "^7.1.1"
             }
         },
+>>>>>>> eb14fddff37f3783c63deba20f53b37383fba652
         "camelcase": {
             "version": "2.1.1",
             "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-2.1.1.tgz",
@@ -315,6 +321,8 @@
                 "supports-color": "^2.0.0"
             }
         },
+<<<<<<< HEAD
+=======
         "chokidar": {
             "version": "4.0.3",
             "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-4.0.3.tgz",
@@ -324,6 +332,7 @@
                 "readdirp": "^4.0.1"
             }
         },
+>>>>>>> eb14fddff37f3783c63deba20f53b37383fba652
         "cliui": {
             "version": "5.0.0",
             "resolved": "https://registry.npmmirror.com/cliui/-/cliui-5.0.0.tgz",
@@ -1047,6 +1056,8 @@
                 "trim-newlines": "^1.0.0"
             }
         },
+<<<<<<< HEAD
+=======
         "micromatch": {
             "version": "4.0.8",
             "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.8.tgz",
@@ -1058,6 +1069,7 @@
                 "picomatch": "^2.3.1"
             }
         },
+>>>>>>> eb14fddff37f3783c63deba20f53b37383fba652
         "mime-db": {
             "version": "1.52.0",
             "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
@@ -1314,6 +1326,8 @@
             "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
             "dev": true
         },
+<<<<<<< HEAD
+=======
         "picomatch": {
             "version": "2.3.1",
             "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
@@ -1321,6 +1335,7 @@
             "dev": true,
             "optional": true
         },
+>>>>>>> eb14fddff37f3783c63deba20f53b37383fba652
         "pify": {
             "version": "2.3.0",
             "resolved": "https://registry.npmmirror.com/pify/-/pify-2.3.0.tgz",
@@ -1607,12 +1622,15 @@
                 "amdefine": ">=0.0.4"
             }
         },
+<<<<<<< HEAD
+=======
         "source-map-js": {
             "version": "1.2.1",
             "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz",
             "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
             "dev": true
         },
+>>>>>>> eb14fddff37f3783c63deba20f53b37383fba652
         "spdx-correct": {
             "version": "3.2.0",
             "resolved": "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.2.0.tgz",
@@ -1741,6 +1759,8 @@
                 "inherits": "2"
             }
         },
+<<<<<<< HEAD
+=======
         "to-regex-range": {
             "version": "5.0.1",
             "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -1751,6 +1771,7 @@
                 "is-number": "^7.0.0"
             }
         },
+>>>>>>> eb14fddff37f3783c63deba20f53b37383fba652
         "tough-cookie": {
             "version": "2.5.0",
             "resolved": "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-2.5.0.tgz",
@@ -1812,6 +1833,11 @@
             "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
             "dev": true
         },
+        "uview-ui": {
+            "version": "2.0.38",
+            "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.38.tgz",
+            "integrity": "sha512-6egHDf9lXHKpG3hEjRE0vMx4+VWwKk/ReTf5x18KrIKqdvdPRqO3+B8Unh7vYYwrIxzAWIlmhZ9RJpKI/4UqPQ=="
+        },
         "validate-npm-package-license": {
             "version": "3.0.4",
             "resolved": "https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",

--
Gitblit v1.9.3