From 78ff74dfc9c42ee12993ac01c43063d0432231e3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 15:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4
---
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