From 307960b07d8cb122d9de0c8267b8cb7a63cfc605 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 09 二月 2026 18:24:25 +0800
Subject: [PATCH] a
---
web/node_modules/uview-ui/package.json | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/web/node_modules/uview-ui/package.json b/web/node_modules/uview-ui/package.json
index 195d476..ae4b852 100644
--- a/web/node_modules/uview-ui/package.json
+++ b/web/node_modules/uview-ui/package.json
@@ -1,11 +1,16 @@
{
+<<<<<<< HEAD
"_from": "uview-ui@^2.0.38",
+=======
+ "_from": "uview-ui@2.0.38",
+>>>>>>> 4eac422e52a4d28fb651b75d0f054697c7a2c0fa
"_id": "uview-ui@2.0.38",
"_inBundle": false,
"_integrity": "sha512-6egHDf9lXHKpG3hEjRE0vMx4+VWwKk/ReTf5x18KrIKqdvdPRqO3+B8Unh7vYYwrIxzAWIlmhZ9RJpKI/4UqPQ==",
"_location": "/uview-ui",
"_phantomChildren": {},
"_requested": {
+<<<<<<< HEAD
"type": "range",
"registry": true,
"raw": "uview-ui@^2.0.38",
@@ -16,12 +21,30 @@
"fetchSpec": "^2.0.38"
},
"_requiredBy": [
+=======
+ "type": "version",
+ "registry": true,
+ "raw": "uview-ui@2.0.38",
+ "name": "uview-ui",
+ "escapedName": "uview-ui",
+ "rawSpec": "2.0.38",
+ "saveSpec": null,
+ "fetchSpec": "2.0.38"
+ },
+ "_requiredBy": [
+ "#USER",
+>>>>>>> 4eac422e52a4d28fb651b75d0f054697c7a2c0fa
"/"
],
"_resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.38.tgz",
"_shasum": "02a0585f2c966a81c2997c79cfff0e8538a89c61",
+<<<<<<< HEAD
"_spec": "uview-ui@^2.0.38",
"_where": "D:\\code\\idea2023\\git\\dingyuannongji\\web",
+=======
+ "_spec": "uview-ui@2.0.38",
+ "_where": "D:\\璞嗙背\\dingyuannongji\\web",
+>>>>>>> 4eac422e52a4d28fb651b75d0f054697c7a2c0fa
"bugs": {
"url": "https://github.com/umicro/uView2.0/issues"
},
--
Gitblit v1.9.3