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/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
	ruoyi/src/main/resources/vm/java/domain.java.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm
This commit is contained in:
疯狂的狮子li
2020-04-25 20:14:40 +08:00
parent 4bee0d652a e7ac78535d
commit 1062da678f
7 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,7 +138,7 @@
padding-left: 15px;
margin-bottom: 10px;
}
/* text color */
.text-navy {
color: #1ab394;
@ -194,4 +194,4 @@
opacity: .8;
color: #fff!important;
background: #42b983!important;
}
}

2
ruoyi-ui/src/views/tool/gen/index.vue
View File

@ -288,4 +288,4 @@ export default {
}
}
};
</script>
</script>