From 1b007b8d43f82cf86e3cf5f2a316f30bae51deb2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 23 五月 2025 12:53:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs' into shuttle_rcs
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index 4d026aa..74910e7 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -23,22 +23,10 @@
private int groupCount;
- private List<String> channel = new ArrayList<>();
-
- private List<CrnSlave> crn = new ArrayList<>();
-
- private List<SteSlave> ste = 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