From 7ba042f4fb701de6916594962116a49b05491178 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 十二月 2023 22:05:56 +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