jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
	ruoyi/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
This commit is contained in:
疯狂的狮子li
2020-07-17 16:43:47 +08:00
parent 22f3e2ad23 d29fe10b93
commit a53a3b3119
10 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-ui/package.json
View File

@ -65,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",