From 31b2e3cabc929e0db720dcdbf779ccb31801d9ff Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 21 Nov 2019 16:33:34 +0800 Subject: [PATCH] =?UTF-8?q?Excel=E6=B3=A8=E8=A7=A3dateFormat=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=97=B6=E6=A0=BC=E5=BC=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 09c9a492..f1c98e1c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -225,11 +225,11 @@ public class ExcelUtil else { String dateFormat = field.getAnnotation(Excel.class).dateFormat(); - if(StringUtils.isNotEmpty(dateFormat)) + if (StringUtils.isNotEmpty(dateFormat)) { - val=DateUtils.parseDateToStr(dateFormat,(Date) val); + val = DateUtils.parseDateToStr(dateFormat, (Date) val); } - else + else { val = Convert.toStr(val); }