From 60d14252f4951b1229e5699a0aa3c993f4ad173d Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 25 四月 2024 23:10:53 +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