From 296392b094a3531cd80bb7974914f494751b2e16 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 14 十二月 2023 16:07:30 +0800 Subject: [PATCH] !458 fix 修复 excel合并注解会根据第一合并列的结果来决定后续的列合并 Merge pull request !458 from simple/excel --- ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a09e5d6..f78c781 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,3 @@ -com.ruoyi.common.security.handler.GlobalExceptionHandler -com.ruoyi.common.security.config.SecurityConfig +org.dromara.common.security.handler.GlobalExceptionHandler +org.dromara.common.security.handler.AllUrlHandler +org.dromara.common.security.config.SecurityConfig -- Gitblit v1.9.3