From e1c7f150792a5085dd64e86e6af82820ab34dc05 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

---
 src/main/java/com/zy/common/model/AgvBasDevpDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/common/model/AgvBasDevpDto.java b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
index 5d9a130..43c7a7b 100644
--- a/src/main/java/com/zy/common/model/AgvBasDevpDto.java
+++ b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
@@ -16,8 +16,12 @@
 
     private AgvWrkMast agvWrkMast;
 
+    private AgvWaitPakin agvWaitPakin;
+
     private List<AgvWaitPakin> agvWaitPakins;
 
+    private AgvWrkDetl agvWrkDetl;
+
     private List<AgvWrkDetl> agvWrkDetls;
 
     private boolean containerMoveOutFlag;

--
Gitblit v1.9.1