From fe97f78b9a343ee9fa45a3531d03d73dcd1df31b Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 06 八月 2025 10:15:12 +0800
Subject: [PATCH] :测试提交“
---
package.json | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/package.json b/package.json
index bc2f004..86ac8fe 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,17 @@
{
"dependencies": {
+<<<<<<< HEAD
+ "@dcloudio/uni-ui": "^1.5.10",
+ "crypto-js": "^4.2.0",
+ "jsencrypt": "^3.3.2",
+=======
"@uqrcode/js": "^4.0.7",
"crypto-js": "^4.2.0",
"jsencrypt": "^3.3.2",
"qrcode": "^1.5.4",
"qrcode.vue": "^3.6.0",
"uqrcodejs": "^4.0.7",
+>>>>>>> master
"uview-ui": "^2.0.38"
},
"devDependencies": {
--
Gitblit v1.8.0