升级poi版本

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>

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 {