From 770217513056ef60d5a10a705d8f75ca11d7d5af Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 26 九月 2021 17:18:09 +0800
Subject: [PATCH] update 修复合并异常
---
ruoyi-ui/package.json | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 57fa9db..58a8c79 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,8 +1,8 @@
{
- "name": "ruoyi",
- "version": "3.4.0",
- "description": "鑻ヤ緷绠＄悊绯荤粺",
- "author": "鑻ヤ緷",
+ "name": "ruoyi-vue-plus",
+ "version": "3.1.0",
+ "description": "RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺",
+ "author": "LionLi",
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",
@@ -41,7 +41,7 @@
"clipboard": "2.0.6",
"core-js": "3.8.1",
"echarts": "4.9.0",
- "element-ui": "2.15.0",
+ "element-ui": "2.15.5",
"file-saver": "2.0.4",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
@@ -55,6 +55,7 @@
"vue": "2.6.12",
"vue-count-to": "1.0.13",
"vue-cropper": "0.5.5",
+ "vue-meta": "^2.4.0",
"vue-router": "3.4.9",
"vuedraggable": "2.24.3",
"vuex": "3.6.0"
--
Gitblit v1.9.3