From df11e588b33a1842be9901ebbf19a240ecae88a3 Mon Sep 17 00:00:00 2001
From: chendt <18902722133@163.com>
Date: Mon, 9 May 2022 10:29:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7poi=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                      | 2 +-
 .../java/com/yami/shop/admin/controller/OrderController.java | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7406b4d..00469a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <guava.version>28.2-jre</guava.version>
         <hutool.version>5.7.15</hutool.version>
         <jsoup.version>1.11.3</jsoup.version>
-        <poi.version>3.17</poi.version>
+        <poi.version>5.0.0</poi.version>
         <qiniu.version>7.2.18</qiniu.version>
         <weixin.version>3.5.0</weixin.version>
         <orika.version>1.5.4</orika.version>
diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java
index 3e8bf89..44e791a 100644
--- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java
+++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java
@@ -10,6 +10,8 @@
 
 package com.yami.shop.admin.controller;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
@@ -255,6 +257,9 @@ public class OrderController {
      * 如果需要合并的话，就合并
      */
     private void mergeIfNeed(ExcelWriter writer, int firstRow, int lastRow, int firstColumn, int lastColumn, Object content) {
+        if (content instanceof Date) {
+            content = DateUtil.format((Date) content, DatePattern.NORM_DATETIME_PATTERN);
+        }
         if (lastRow - firstRow > 0 || lastColumn - firstColumn > 0) {
             writer.merge(firstRow, lastRow, firstColumn, lastColumn, content, false);
         } else {