From 55ce0e34c9183aebe802b91dba88cd54c6eaa48b Mon Sep 17 00:00:00 2001 From: 司猫子 <songshuang@qq.com> Date: 星期日, 04 二月 2024 09:52:19 +0800 Subject: [PATCH] !480 优化单元格合并后多余内容的清除 * excel插件 优化合并策略 在合适的生命周期完成合并 去除被合并单元格的非首行内容 --- ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b421558..3395e73 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,7 +1,6 @@ -com.ruoyi.common.core.config.ApplicationConfig -com.ruoyi.common.core.config.AsyncConfig -com.ruoyi.common.core.config.JacksonConfig -com.ruoyi.common.core.config.RuoYiConfig -com.ruoyi.common.core.config.ThreadPoolConfig -com.ruoyi.common.core.config.ValidatorConfig -com.ruoyi.common.core.utils.SpringUtils +org.dromara.common.core.config.ApplicationConfig +org.dromara.common.core.config.AsyncConfig +org.dromara.common.core.config.RuoYiConfig +org.dromara.common.core.config.ThreadPoolConfig +org.dromara.common.core.config.ValidatorConfig +org.dromara.common.core.utils.SpringUtils -- Gitblit v1.9.3