From 6c85a6bd1ceaacd44c18bfb6a0dc3a9367d13d39 Mon Sep 17 00:00:00 2001
From: hmpc <hmpc>
Date: 星期一, 18 十一月 2024 14:34:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hcddwcs-gdfs' into hcddwcs-gdfs

---
 src/main/java/com/zy/core/model/protocol/SteProtocol.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 4986894..864229f 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -33,7 +33,9 @@
      IDLE(0, "绌洪棽"),
      MOVING(1, "浣滀笟涓�"),
      SOS(2, "鎶ヨ"),
-     WAITING(3, "浠诲姟瀹屾垚绛夊緟WCS纭"),
+     WAITING(10, "绛夊緟纭"),
+     OFF_LINE(-1, "鏈煡"),
+     OTHER(100, "鍏跺畠"),
      */
     public Short status;
 
@@ -80,7 +82,7 @@
     /**
      * 婊＄數
      */
-    public Boolean fullCharge;
+    public Boolean fullCharge = false;
 
     /**
      * 浣庣數閲�

--
Gitblit v1.9.1