From da8323a2468e2a3dcfab461f459008da8c6139a5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 23 十一月 2024 17:32:24 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/BasJarController.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 3af53de..6a3c7c9 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -145,9 +145,12 @@
             vo.setJarTemperature(basJar.getJarTemperature());
             vo.setJarTemperature$(basJar.getJarTemperature().toString()+"鈩�");
             vo.setJarPressure(basJar.getJarPressure());
-            vo.setJarPressure$(basJar.getJarPressure().toString()+"Pa");
+            vo.setJarPressure$(basJar.getJarPressure().toString()+"MPa");
             vo.setJarCount(basJar.getJarCount());//鏈�澶у偍閲�
             vo.setJarCount$(basJar.getJarCount().toString()+"鎵�");//鏈�澶у偍閲�
+            vo.setHoldingTime(DateUtils.convert(basJar.getHoldingTime()));//淇濇俯鏃堕棿
+            vo.setOpenTime(DateUtils.convert(basJar.getOpenTime()));//寮�闂ㄦ椂闂�
+            vo.setCloseTime(DateUtils.convert(basJar.getCloseTime()));//鍏抽棬鏃堕棿
 
         }
         return R.ok().add(list);

--
Gitblit v1.9.1