From fb19dd3e4e7e99f3c11d91a35b5eccfb64bd4dc0 Mon Sep 17 00:00:00 2001
From: yongdaidai <7805924+yongdaidai@user.noreply.gitee.com>
Date: 星期五, 31 七月 2020 14:59:23 +0800
Subject: [PATCH] update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml. 解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题.
---
ruoyi-ui/package.json | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 6992044..a78acad 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,11 +1,11 @@
{
"name": "ruoyi",
- "version": "2.1.0",
+ "version": "3.0.0",
"description": "若依管理系统",
"author": "若依",
"license": "MIT",
"scripts": {
- "dev": "vue-cli-service serve",
+ "dev": "vue-cli-service serve --open",
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",
@@ -44,7 +44,7 @@
"axios": "0.18.1",
"clipboard": "2.0.4",
"echarts": "4.2.1",
- "element-ui": "2.11.1",
+ "element-ui": "2.13.2",
"file-saver": "2.0.1",
"js-beautify": "^1.10.2",
"fuse.js": "3.4.4",
@@ -54,9 +54,10 @@
"nprogress": "0.2.0",
"path-to-regexp": "2.4.0",
"screenfull": "4.2.0",
+ "sortablejs": "1.8.4",
"vue": "2.6.10",
"vue-count-to": "1.0.13",
- "vue-quill-editor": "3.0.6",
+ "vue-quill-editor": "3.0.6",
"vue-cropper": "0.4.9",
"vue-router": "3.0.2",
"vue-splitpane": "1.0.4",
@@ -64,9 +65,6 @@
"vuex": "3.1.0"
},
"devDependencies": {
- "@babel/core": "7.0.0",
- "@babel/register": "7.0.0",
- "@babel/parser": "^7.7.4",
"@vue/cli-plugin-babel": "3.5.3",
"@vue/cli-plugin-eslint": "^3.9.1",
"@vue/cli-plugin-unit-jest": "3.5.3",
@@ -86,9 +84,9 @@
"husky": "1.3.1",
"lint-staged": "8.1.5",
"mockjs": "1.0.1-beta3",
- "node-sass": "^4.9.0",
"plop": "2.3.0",
"runjs": "^4.3.2",
+ "sass": "^1.26.10",
"sass-loader": "^7.1.0",
"script-ext-html-webpack-plugin": "2.1.3",
"script-loader": "0.7.2",
--
Gitblit v1.9.2