From e16d675fbd656e5dd6e109a4a1133fc1e351aa7f Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期六, 10 五月 2025 08:38:57 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
index f3e077c..5eaadf4 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/service/impl/DataServiceImpl.java
@@ -289,9 +289,9 @@
}
result.put("planData", planData);
result.put("predData", predData);
- result.put("predictTime", predictTime);
- result.put("startTime", startTime);
- result.put("endTime", endTime);
+ result.put("predictTime", DateUtils.format(predictTime, "yyyy-MM-dd HH:mm:00"));
+ result.put("startTime", DateUtils.format(startTime, "yyyy-MM-dd HH:mm:00"));
+ result.put("endTime", DateUtils.format(endTime, "yyyy-MM-dd HH:mm:00"));
return result;
}
--
Gitblit v1.9.3