From 52ccae38d7d236765eb2dfd8c325fd94f99d43b1 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 02 三月 2026 14:38:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
index edff85b..a97a70a 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java
@@ -66,11 +66,11 @@
result.put("start", start);
result.put("timeDesc",
- DateFormatUtils.format(start, "yyyy-MM-dd") + " 鎴嚦锛�"
+ DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
+ DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
result.put("createUser", ContextUtil.getLoginUserName());
- result.put("createTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+ result.put("createTime", new Date());
return result;
}
--
Gitblit v1.9.3