From 181164e578bb0412a252c71a16500e6a62258d05 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 05 Aug 2024 20:36:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
index b57e6ae..2f28444 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
@@ -91,7 +91,7 @@
@GetMapping("/download/overFloodInfo")
public ResponseEntity overFloodInfo(String isShow) throws Exception {
- String time = new SimpleDateFormat("yyyy日MM月dd日HH时").format(new Date());
+ String time = new SimpleDateFormat("yyyy年MM月dd日HH时").format(new Date());
String fileName = time + "报汛文件.docx";
String fileNameURL = URLEncoder.encode(fileName, "UTF-8");
//获取总览、大中库、明细数据
--
Gitblit v1.9.3