From 9b36259270078e99c7665a818fff90bbcde8ef7d Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 18 三月 2026 09:23:58 +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, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/model/AgvBasDevpDto.java b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
index 627ec00..f83b1bf 100644
--- a/src/main/java/com/zy/common/model/AgvBasDevpDto.java
+++ b/src/main/java/com/zy/common/model/AgvBasDevpDto.java
@@ -16,11 +16,11 @@
private AgvWrkMast agvWrkMast;
- private List<AgvWaitPakin> agvWaitPakin;
+ private AgvWaitPakin agvWaitPakin;
private List<AgvWaitPakin> agvWaitPakins;
- private List<AgvWrkDetl> agvWrkDetl;
+ private AgvWrkDetl agvWrkDetl;
private List<AgvWrkDetl> agvWrkDetls;
--
Gitblit v1.9.1