From 22d9b27f913cc47d54b361870f62aa81b4c8fd85 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 三月 2023 14:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xzjlwcs' into xzjlwcs

---
 src/main/java/com/zy/core/model/protocol/SteProtocol.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
index a7e6571..5ed0d12 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -536,6 +536,11 @@
         }
     }
 
+    // 灏忚溅鐢甸噺
+    public Float isIdle2() {
+        return this.charge;
+    }
+
     // 鏄惁澶勪簬鎶ヨ鐘舵��
     public Boolean isAlarm() {
         return this.alarm > 1;

--
Gitblit v1.9.1