From 0a6c8dbb6e6e2991890b38648a9acc55df87b9d8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 18:30:08 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' of http://120.27.238.55:7000/r/beauty-erp into feature/订单服务单代码改造
---
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
index 9180456..81defe9 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
@@ -281,7 +281,7 @@
res.setContentType("application/octet-stream;charset=UTF-8");
Date date = new Date();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日HH时mm分ss");
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
res.setHeader("Content-Disposition", "attachment;filename=" +
java.net.URLEncoder.encode("订单列表" + dateFormat.format(date) + ".xlsx".trim(), "UTF-8"));
--
Gitblit v1.9.1