diff --git a/pom.xml b/pom.xml
index 7406b4d..00469a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
28.2-jre
5.7.15
1.11.3
- 3.17
+ 5.0.0
7.2.18
3.5.0
1.5.4
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 {