疯狂的狮子li 6f6a3566ac Merge remote-tracking branch 'origin/dev' into satoken ...

# Conflicts:
#	pom.xml
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java

2021-09-26 17:15:40 +08:00

..

src/main/java/com/ruoyi/framework

Merge remote-tracking branch 'origin/dev' into satoken

2021-09-26 17:15:40 +08:00

pom.xml

update 调整依赖结构 解决依赖冲突

2021-09-22 11:10:10 +08:00