From 4826273f09d0d1658037da600c721db47ea4212e Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Wed, 11 Sep 2024 20:34:01 +0800 Subject: [PATCH] # 4.0.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 兼容部分日期格式读取异常的问题 --- .../test/core/dataformat/DateFormatTest.java | 3 +++ .../resources/dataformat/dataformatv2.xlsx | Bin 8782 -> 8889 bytes 2 files changed, 3 insertions(+) diff --git a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java index fa7a517b..d8fd95b3 100644 --- a/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java +++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java @@ -56,6 +56,9 @@ public class DateFormatTest { Assertions.assertEquals("2023-1-01 00:00:00", dataMap.get(1).get(0)); Assertions.assertEquals("2023-1-01 00:00:00", dataMap.get(2).get(0)); Assertions.assertEquals("2023-1-01 00:00:01", dataMap.get(3).get(0)); + Assertions.assertEquals("2023-1-01 00:00:00", dataMap.get(4).get(0)); + Assertions.assertEquals("2023-1-01 00:00:00", dataMap.get(5).get(0)); + Assertions.assertEquals("2023-1-01 00:00:01", dataMap.get(6).get(0)); } private void readCn(File file) { diff --git a/easyexcel-test/src/test/resources/dataformat/dataformatv2.xlsx b/easyexcel-test/src/test/resources/dataformat/dataformatv2.xlsx index 8b9c7cbb59edd507fffb216c6fde3cbe282554df..c49aa0440841205e938b36dcec1ed2abd6ecbb9c 100644 GIT binary patch delta 2217 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