From a820ec5dc1682ac0a31fcbdba3eb4d2c0fe74b64 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 17:11:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/mindskip/xzs/utility/excel/ExcelUtils.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/utility/excel/ExcelUtils.java b/src/main/java/com/mindskip/xzs/utility/excel/ExcelUtils.java
index cd48306..eebdba0 100644
--- a/src/main/java/com/mindskip/xzs/utility/excel/ExcelUtils.java
+++ b/src/main/java/com/mindskip/xzs/utility/excel/ExcelUtils.java
@@ -875,6 +875,12 @@
             cell.setCellValue("");
             return CELL_OTHER;
         }
+        // 鏁版嵁涓�""鏃�
+        if ("".equals(o)) {
+            cell.setCellType(CellType.STRING);
+            cell.setCellValue("");
+            return CELL_OTHER;
+        }
         // 鏄惁涓哄瓧绗︿覆
         if (o instanceof String) {
             String s = o.toString();

--
Gitblit v1.8.0