From a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 23 十二月 2023 19:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1
---
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