疯狂的狮子li 97873a7b2b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: pom.xml ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java ruoyi-ui/src/assets/styles/ruoyi.scss ruoyi-ui/src/components/ThemePicker/index.vue ruoyi-ui/src/layout/components/Settings/index.vue ruoyi-ui/src/store/modules/settings.js		2021-04-19 17:43:32 +08:00
..
Breadcrumb	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue	2020-12-18 09:45:54 +08:00
Editor	富文本编辑器支持自定义上传地址	2021-04-13 09:38:32 +08:00
FileUpload	表格右侧工具栏组件支持显隐列	2021-01-06 17:30:39 +08:00
Hamburger	初始化项目	2020-02-13 10:48:51 +08:00
HeaderSearch	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue	2021-01-06 09:35:00 +08:00
IconSelect	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue	2020-06-08 12:01:19 +08:00
ImageUpload	图片组件添加预览功能	2021-01-05 20:33:41 +08:00
Pagination	初始化项目	2020-02-13 10:48:51 +08:00
PanThumb	初始化项目	2020-02-13 10:48:51 +08:00
ParentView	三级菜单自动配置组件	2020-11-28 20:39:03 +08:00
RightPanel	初始化项目	2020-02-13 10:48:51 +08:00
RightToolbar	显隐列初始默认隐藏列	2021-03-24 15:46:37 +08:00
RuoYi	修复前端页面报错 找不到模块问题	2020-04-25 20:09:39 +08:00
Screenfull	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue	2020-12-11 14:27:54 +08:00
SizeSelect	初始化项目	2020-02-13 10:48:51 +08:00
SvgIcon	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue	2020-06-01 13:34:08 +08:00
ThemePicker	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-04-19 17:43:32 +08:00
TopNav	主题颜色保存配置	2021-04-19 16:59:56 +08:00