From ffbcb17a9ce705b443c3a450e3e3d56f13ee712f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 23 九月 2025 13:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
src/main/java/com/zy/core/action/ShuttleAction.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/action/ShuttleAction.java b/src/main/java/com/zy/core/action/ShuttleAction.java
index d3e961f..3df5b16 100644
--- a/src/main/java/com/zy/core/action/ShuttleAction.java
+++ b/src/main/java/com/zy/core/action/ShuttleAction.java
@@ -565,7 +565,7 @@
return;
}
- if (shuttleThread.isRequireCharge()) {
+ if (!shuttleThread.isRequireCharge().equals(ShuttleRequireChargeType.NONE)) {
return;
}
--
Gitblit v1.9.1