From a1ea92d773f2fc846651c0c31d18ccc9ed1a8fb2 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq,com>
Date: 星期三, 17 一月 2024 17:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs
---
src/main/java/com/zy/core/model/DevpSlave.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index df80422..a13cb76 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -27,6 +27,10 @@
private List<Sta> pickSta = new ArrayList<>();
+ private List<Sta> autoEmptyOut = new ArrayList<>();
+
+ private List<Sta> autoEmptyIn = new ArrayList<>();
+
@Data
public static class Sta {
@@ -34,9 +38,9 @@
private Integer barcode;
- private Integer barcode1;
+ private Integer backSta;
- private Integer barcode2;
+ private Integer led;
}
--
Gitblit v1.9.1