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