From f8aa646b7e3b2a70ad35b9ed6c4667277e12835a Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 09 Aug 2025 14:09:47 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.1' into feature/v5.0/5.0.2

---
 package.json |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 576da60..1d314d8 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
         "@saber/nf-design-base-elp": "^1.2.0",
         "@smallwei/avue": "^3.4.4",
         "@turf/turf": "6.5.0",
-        "postcss-pxtorem": "^6.1.0",
         "animate.css": "^4.1.1",
         "avue-plugin-ueditor": "^1.0.3",
         "axios": "^0.21.1",
@@ -33,13 +32,15 @@
         "lodash": "^4.17.21",
         "mitt": "^3.0.1",
         "nprogress": "^0.2.0",
+        "postcss-pxtorem": "^6.1.0",
+        "qrcodejs2-fix": "^0.0.1",
         "reconnecting-websocket": "^4.4.0",
         "sm-crypto": "^0.3.13",
+        "uuid": "^11.1.0",
         "vue": "^3.4.27",
         "vue-i18n": "^9.1.9",
         "vue-router": "^4.3.2",
         "vuex": "^4.1.0",
-        "uuid": "^11.1.0",
         "xlsx": "^0.18.5"
     },
     "devDependencies": {

--
Gitblit v1.9.3