From 8c2d952e4ea6925a04d083c0e73817f2c3400049 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 21 八月 2025 14:03:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/java/com/zy/core/model/DevpSlave.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index 3130400..24365d1 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -27,6 +27,8 @@
private List<Sta> pickInSta = new ArrayList<>();
+ private List<Sta> pickInSta2 = new ArrayList<>();
+
private List<Sta> pickOutSta = new ArrayList<>();
private List<StaRack> rackInStn = new ArrayList<>();
@@ -44,6 +46,8 @@
private Integer led;
+ private Integer liftNo;
+
}
@Data
--
Gitblit v1.9.1