From 22a4f2b58fa1baa233e621d1406df456b516b4b1 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 07 四月 2026 16:19:07 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReportPR.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 306e62a..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
@@ -7,7 +7,6 @@
import com.fzzy.igds.constant.FoodVariety;
import com.fzzy.igds.data.GrainDataReport;
import com.fzzy.igds.domain.DepotConf;
-import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.Grain;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.DepotConfService;
@@ -67,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