From a5fd6b72f8342f0228321849b04c822feba2d2a0 Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期三, 02 七月 2025 09:42:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs' into shuttle_rcs
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index 4f5e7a5..74910e7 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -23,20 +23,10 @@
private int groupCount;
- private List<String> channel = new ArrayList<>();
-
- private List<DevpSlave> devp = new ArrayList<>();
-
- private List<Slave> barcode = new ArrayList<>();
-
- private List<LedSlave> led = new ArrayList<>();
-
- private List<Slave> scale = new ArrayList<>();
-
- private List<Slave> car = new ArrayList<>();
-
private List<ShuttleSlave> shuttle = new ArrayList<>();
private List<ForkLiftSlave> forkLift = new ArrayList<>();
+ private List<ForkLiftSlave> forkLiftMaster = new ArrayList<>();
+
}
--
Gitblit v1.9.1