From 584a10477ffa1f670d07a05401ab7ec2c696204a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 09 一月 2024 15:53:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3

---
 src/main/java/com/zy/core/model/DevpSlave.java |    2 ++
 1 files changed, 2 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 5e48bcc..24365d1 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -27,6 +27,8 @@
 
     private List<Sta> pickInSta = new ArrayList<>();
 
+    private List<Sta> pickInSta2 = new ArrayList<>();
+
     private List<Sta> pickOutSta = new ArrayList<>();
 
     private List<StaRack> rackInStn = new ArrayList<>();

--
Gitblit v1.9.1