From f107eaf4d1857d2230a5bc6983e4beb7fb811aa1 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期六, 08 七月 2023 22:06:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs6' into bfwcs6

---
 src/main/java/com/zy/core/model/DevpSlave.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index e327301..c5c02f0 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -25,7 +25,9 @@
 
     private List<Sta> outSta = new ArrayList<>();
 
-    private List<Sta> pickSta = new ArrayList<>();
+    private List<Sta> pickInSta = new ArrayList<>();
+
+    private List<Sta> pickOutSta = new ArrayList<>();
 
     @Data
     public static class Sta {

--
Gitblit v1.9.1