疯狂的狮子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
..
domain	update 防止 MP 无主键警告	2022-01-13 10:26:18 +08:00
listener	Merge remote-tracking branch 'origin/dev' into satoken	2021-12-27 09:50:42 +08:00
mapper	[重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖	2022-01-12 21:22:26 +08:00
runner	update 初始化数据转移到 ApplicationRunner 统一处理	2021-11-24 10:59:18 +08:00
service	Merge remote-tracking branch 'origin/satoken' into dev	2022-01-13 11:14:33 +08:00