Merge remote-tracking branch 'ruoyi-cloud/master' into dev
# Conflicts: # pom.xml # ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java # ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java # ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java # ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java # ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm # ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java # ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java # ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java # ruoyi-ui/src/assets/styles/ruoyi.scss # ruoyi-ui/src/utils/request.js # 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.vue2.X
疯狂的狮子li
2 years ago
commit
6c9979cede