From 8a8faba0f55512a2c18c4fe719a1bb0c4f6a86c9 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 08:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
index 4ef529b..08bf110 100644
--- a/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java
@@ -129,7 +129,7 @@
/**
* 褰撳墠鐨勭數鍘嬪��
*/
- private Double currentVoltage;
+ private Integer currentVoltage;
/**
* 褰撳墠鐨勬ā鎷熼噺鍊�
@@ -216,4 +216,11 @@
return ShuttleProtocolStatusType.get(this.status).desc;
}
+ public String getCurrentVoltage$() {
+ if (this.currentVoltage == null) {
+ return "";
+ }
+ return (this.currentVoltage / 1000.0) + "V";
+ }
+
}
--
Gitblit v1.9.1