From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop

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

diff --git a/package.json b/package.json
index 2e77700..b84ea07 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@antv/data-set": "^0.11.4",
     "@jeecg/antd-online-mini": "3.0.0-RC",
+    "@jiaminghi/data-view": "^2.10.0",
     "@tinymce/tinymce-vue": "2.1.0",
     "@toast-ui/editor": "^2.1.2",
     "ali-oss": "^6.17.1",
@@ -33,6 +34,8 @@
     "md5": "^2.2.1",
     "nprogress": "^0.2.0",
     "qs": "^6.11.1",
+    "sass-loader": "^13.3.2",
+    "style-loader": "^3.3.3",
     "tinymce": "5.4.1",
     "viser-vue": "^2.4.8",
     "vue": "^2.6.10",
@@ -47,7 +50,7 @@
     "vue-print-nb-jeecg": "^1.0.9",
     "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.4",
-    "vuedraggable": "^2.20.0",
+    "vuedraggable": "2.20.0",
     "vuex": "^3.1.0",
     "vxe-table": "2.9.13",
     "vxe-table-plugin-antd": "1.8.10",

--
Gitblit v1.9.3