疯狂的狮子li 6ca8535166 Merge remote-tracking branch 'origin/satoken' 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/aspectj/DataScopeAspect.java # ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java # ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java # ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java # ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java # ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java # ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java # ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java # ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java # ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java # ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml		2022-01-13 11:14:33 +08:00
..
config	update [重大更新]全业务 增加 接口文档注解 格式化代码	2021-10-15 15:19:42 +08:00
controller	Merge remote-tracking branch 'origin/dev' into satoken	2021-12-27 09:50:42 +08:00
domain	update 代码生成 改为生成抽象实体	2021-10-15 16:19:51 +08:00
mapper	[重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖	2022-01-12 21:22:26 +08:00
service	Merge remote-tracking branch 'origin/satoken' into dev	2022-01-13 11:14:33 +08:00
util	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev	2021-12-27 09:30:12 +08:00