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 remote-tracking branch 'ruoyi-vue/master' into dev

Browse Source 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
#	ruoyi-ui/src/assets/styles/ruoyi.scss
#	ry.bat
This commit is contained in:
疯狂的狮子li
2022-01-29 09:23:11 +08:00
parent ce9e033551 612c4293d1
commit 0b852faf00
6 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-ui/src/assets/styles/ruoyi.scss
View File

@ -47,9 +47,8 @@
.mb10 {
margin-bottom: 10px;
}
.ml0 {
margin-left: 10px;
.ml10 {
margin-left: 10px;
}
.mt20 {
@ -63,9 +62,8 @@
.mb20 {
margin-bottom: 20px;
}
.m20 {
margin-left: 20px;
.ml20 {
margin-left: 20px;
}
.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {