You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
疯狂的狮子li e810021b57 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
4 years ago
..
api add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构 4 years ago
assets fix css class name 4 years ago
components Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 4 years ago
directive 自定义文字复制剪贴指令 4 years ago
layout 优化提示信息 4 years ago
plugins fix 修复 资源文件 下载问题 4 years ago
router Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 4 years ago
store update 补全 接口文档注解 调整返回类型为 R 4 years ago
utils 优化代码 4 years ago
views fix 修复 角色菜单权限列表 返回体结构漏改 4 years ago
App.vue 系统布局配置支持动态标题开关 5 years ago
main.js add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构 4 years ago
permission.js 系统布局配置支持动态标题开关 5 years ago
settings.js 系统布局配置支持动态标题开关 5 years ago