Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Conflicts: ruoyi-ui/package.json
5 years ago · 2925f28255
parent b5e8fa2b98 2903de1561
commit 2925f28255
1 changed files with 1 additions and 1 deletions
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@ -41,7 +41,7 @@
    "clipboard": "2.0.6",
    "core-js": "3.8.1",
    "echarts": "4.9.0",
-    "element-ui": "2.14.1",
+    "element-ui": "2.15.0",
    "file-saver": "2.0.4",
    "fuse.js": "6.4.3",
    "highlight.js": "9.18.5",