From e96b0d2ac2d14a1035e91cf221f5ecd764980e16 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期日, 08 十月 2023 11:41:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/hx/util/ExcelUtil.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/hx/util/ExcelUtil.java b/src/main/java/com/hx/util/ExcelUtil.java
index 57bc636..ee0af02 100644
--- a/src/main/java/com/hx/util/ExcelUtil.java
+++ b/src/main/java/com/hx/util/ExcelUtil.java
@@ -976,7 +976,8 @@
cell = row.getCell(j);
if (cell == null) {
arrayString.add("");
- } else if (cell.getCellType() == CellType.NUMERIC) {
+ }
+ if (cell.getCellType() == CellType.NUMERIC) {
isData = true;
format = cell.getCellStyle().getDataFormat();
if (format == 14 || format == 31 || format == 57 || format == 58) {
--
Gitblit v1.8.0