From cf9fac40a8e39b25ee935a743224ae6c405bbddc Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 24 三月 2025 19:33:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/java/com/zy/core/model/DevpSlave.java | 5 +++++
1 files changed, 5 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 fb50f0a..799cab2 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -21,6 +21,8 @@
private List<Sta> inSta = new ArrayList<>();
+ private List<Sta> emptyInSta = new ArrayList<>();
+
private List<Sta> outSta = new ArrayList<>();
private List<Sta> pickSta = new ArrayList<>();
@@ -32,6 +34,9 @@
private Integer barcode;
+ private Integer scale;
+
+ private Integer backSta;
}
}
--
Gitblit v1.9.1