From fe1801f4f3b9a3e2c9c0a7c1b004a9345be1b446 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 22 五月 2023 18:51:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/core/model/DevpSlave.java | 8 ++++++++
1 files changed, 8 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 dcbbe12..ad33be5 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -15,8 +15,16 @@
@Data
public class DevpSlave extends Slave {
+ private Integer rack;
+
+ private Integer slot;
+
private List<Sta> inSta = new ArrayList<>();
+ private List<Sta> emptyInSta = new ArrayList<>();
+
+ private List<Sta> outSta = new ArrayList<>();
+
private List<Sta> pickSta = new ArrayList<>();
@Data
--
Gitblit v1.9.1