疯狂的狮子li 741a5b275b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: pom.xml ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java ruoyi-ui/package.json ruoyi-ui/src/views/monitor/server/index.vue		2021-10-11 09:37:06 +08:00
..
aspectj	fix 修复 多数据源aop语法错误	2021-09-28 14:37:03 +08:00
config	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-10-11 09:37:06 +08:00
jackson	update 更新 BigNumberSerializer 书写错误	2021-07-29 15:09:23 +08:00
manager	update 日常字符串校验 统一重构到 StringUtils 便于维护扩展	2021-08-02 12:15:14 +08:00
mybatisplus	update 用户未登录日志改为 warn 级别	2021-09-15 10:53:14 +08:00
security	update 回滚配置	2021-09-26 16:42:42 +08:00
web/exception	升级SpringBoot到最新版本2.5.5	2021-10-10 11:24:16 +08:00