From 5bd42df0ef1bcdbc3911381274b4f3f267d0203b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 13 八月 2025 09:45:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs_dev' into shuttle_rcs_dev
---
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