Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts: # pom.xml # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.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/constant/HttpStatus.java # ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java # ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java # ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java # ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java # ruoyi-generator/src/main/resources/vm/java/controller.java.vm # ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java # ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java # ruoyi-ui/src/assets/icons/svg/system.svg # ruoyi-ui/src/views/monitor/job/index.vue # ruoyi-ui/src/views/system/role/index.vue # ruoyi-ui/src/views/system/user/index.vue # ruoyi-ui/src/views/system/user/profile/userAvatar.vue
This commit is contained in:
疯狂的狮子li
commit
c1a3eaaffb