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 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index 9de7962..74910e7 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -27,4 +27,6 @@
 
     private List<ForkLiftSlave> forkLift = new ArrayList<>();
 
+    private List<ForkLiftSlave> forkLiftMaster = new ArrayList<>();
+
 }

--
Gitblit v1.9.1