From 3efe34fdc1dfe58e16c8689faf086b38b2d73e83 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 16 三月 2026 16:41:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-version1.0
---
src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java b/src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java
index 3959d31..40bdbfa 100644
--- a/src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java
+++ b/src/main/java/com/zy/core/network/entity/ZyStationStatusEntity.java
@@ -41,6 +41,9 @@
//鎶ヨ
private Integer error;
+ //鎶ヨ淇℃伅
+ private String errorMsg;
+
//鏉＄爜
private String barcode;
@@ -50,6 +53,9 @@
//杩愯鍫靛
private boolean runBlock = false;
+ //鍚姩鍏ュ簱
+ private boolean enableIn = false;
+
@Override
public ZyStationStatusEntity clone() {
try {
--
Gitblit v1.9.1