From 0e6464d3449fa6c239f8a26991ab2259d99b4aae Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 20 十月 2023 10:10:11 +0800
Subject: [PATCH] update springboot 3.1.4 => 3.1.5 update springboot 2.7.14 => 2.7.17(扩展服务) update poi 5.2.3 => 5.2.4 update satoken 1.36.0 => 1.37.0 update springboot-admin 3.1.6 => 3.1.7 update redisson 3.23.5 => 3.24.1
---
ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
index 00a78ea..329911d 100644
--- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
@@ -196,10 +196,8 @@
// 鍚堝苟澶勭悊鍣�
builder.registerWriteHandler(new CellMergeStrategy(list, true));
}
- if (CollUtil.isNotEmpty(options)) {
- // 娣诲姞涓嬫媺妗嗘搷浣�
- builder.registerWriteHandler(new ExcelDownHandler(options));
- }
+ // 娣诲姞涓嬫媺妗嗘搷浣�
+ builder.registerWriteHandler(new ExcelDownHandler(options));
builder.doWrite(list);
}
--
Gitblit v1.9.3