疯狂的狮子li af25588b88 Merge remote-tracking branch 'ruoyi-vue/master' into dev ... # Conflicts: # pom.xml # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java # ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java # ruoyi-generator/pom.xml # ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java # ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java # ruoyi-generator/src/main/resources/vm/js/api.js.vm # ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm # ruoyi-generator/src/main/resources/vm/vue/index.vue.vm # ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm # ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java # ruoyi-ui/package.json # ruoyi-ui/src/api/monitor/server.js # ruoyi-ui/src/components/RuoYi/Doc/index.vue # ruoyi-ui/src/components/RuoYi/Git/index.vue # ruoyi-ui/src/components/SizeSelect/index.vue # ruoyi-ui/src/layout/components/Sidebar/Logo.vue # ruoyi-ui/src/layout/components/TagsView/index.vue # ruoyi-ui/src/layout/index.vue # ruoyi-ui/src/main.js # ruoyi-ui/src/plugins/download.js # ruoyi-ui/src/router/index.js # ruoyi-ui/src/store/modules/permission.js # ruoyi-ui/src/store/modules/settings.js # ruoyi-ui/src/store/modules/tagsView.js # ruoyi-ui/src/store/modules/user.js # ruoyi-ui/src/views/login.vue # ruoyi-ui/src/views/monitor/job/log.vue # ruoyi-ui/src/views/system/dict/data.vue # ruoyi-ui/src/views/system/role/index.vue # ruoyi-ui/src/views/system/user/authRole.vue # ruoyi-ui/src/views/system/user/index.vue # ruoyi-ui/src/views/system/user/profile/resetPwd.vue # ruoyi-ui/src/views/system/user/profile/userAvatar.vue # ruoyi-ui/src/views/system/user/profile/userInfo.vue		2021-11-25 19:39:53 +08:00
..
Breadcrumb	优化前端代码	2021-11-24 14:47:24 +08:00
Crontab	修正单词拼写错误	2021-09-05 21:36:33 +08:00
DictData	使用vue-data-dict，简化数据字典使用	2021-09-17 15:36:54 +08:00
DictTag	使用vue-data-dict，简化数据字典使用	2021-09-17 15:36:54 +08:00
Editor	update 优化 OSS 模块与上传组件 异常处理	2021-08-18 19:14:26 +08:00
FileUpload	update 更改上传数据回填	2021-10-14 17:28:13 +08:00
Hamburger	初始化项目	2020-02-13 10:48:51 +08:00
HeaderSearch	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-07-12 09:37:23 +08:00
IconSelect	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue	2020-06-08 12:01:19 +08:00
iFrame	封装iframe组件	2021-06-17 20:17:42 +08:00
ImageUpload	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-09-13 13:03:58 +08:00
Pagination	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-06-17 18:15:34 +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-11-22 18:06:44 +08:00
RuoYi	Merge remote-tracking branch 'ruoyi-vue/master' into dev	2021-11-25 19:39:53 +08:00
Screenfull	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue	2020-12-11 14:27:54 +08:00
SizeSelect	Merge remote-tracking branch 'ruoyi-vue/master' into dev	2021-11-25 19:39:53 +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-09-13 13:03:58 +08:00
TopNav	顶部菜单样式调整	2021-07-25 19:06:57 +08:00