xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-10-11 20:43:44 +08:00
Code Issues Actions 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/components/Breadcrumb/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
This commit is contained in:
疯狂的狮子li
2020-12-18 09:45:54 +08:00
parent b029a7265a c86dc20743
commit 6c8497f632
10 changed files with 56 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-ui/package.json
View File

@@ -49,7 +49,6 @@
"js-cookie": "2.2.1",
"jsencrypt": "3.0.0-rc.1",
"nprogress": "0.2.0",
"path-to-regexp": "6.2.0",
"quill": "1.3.7",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",