From 4ada48181241beca24d10a71bd2b7f87168ae491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E4=B9=90=E5=A4=A9?= <869759838@qq.com>
Date: Thu, 17 Dec 2020 09:28:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=A4=E4=B8=AA=E7=B2=BE?=
 =?UTF-8?q?=E5=BA=A6=E5=8F=AA=E5=88=B0=E5=88=86=E7=9A=84=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/alibaba/excel/util/DateUtils.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/com/alibaba/excel/util/DateUtils.java b/src/main/java/com/alibaba/excel/util/DateUtils.java
index 815257b9..cef0098a 100644
--- a/src/main/java/com/alibaba/excel/util/DateUtils.java
+++ b/src/main/java/com/alibaba/excel/util/DateUtils.java
@@ -43,6 +43,8 @@ public class DateUtils {
 
     public static final String DATE_FORMAT_10 = "yyyy-MM-dd";
     public static final String DATE_FORMAT_14 = "yyyyMMddHHmmss";
+    public static final String DATE_FORMAT_16 = "yyyy-MM-dd HH:mm";
+    public static final String DATE_FORMAT_16_FORWARD_SLASH = "yyyy/MM/dd HH:mm";
     public static final String DATE_FORMAT_17 = "yyyyMMdd HH:mm:ss";
     public static final String DATE_FORMAT_19 = "yyyy-MM-dd HH:mm:ss";
     public static final String DATE_FORMAT_19_FORWARD_SLASH = "yyyy/MM/dd HH:mm:ss";
@@ -91,6 +93,12 @@ public class DateUtils {
                 } else {
                     return DATE_FORMAT_19_FORWARD_SLASH;
                 }
+            case 16:
+                if (dateString.contains(MINUS)) {
+                    return DATE_FORMAT_16;
+                } else {
+                    return DATE_FORMAT_16_FORWARD_SLASH;
+                }
             case 17:
                 return DATE_FORMAT_17;
             case 14: