From f1881f78bbc6a1414a62ace008a2c3779df78511 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期一, 04 八月 2025 08:08:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/AgvBasDevpDto.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 4 ++--
src/main/resources/application.yml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
index 181abe4..85f1aad 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -148,7 +148,7 @@
//鐢ㄤ簬鐢佃鏈烘樉绀�
agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
//鐢ㄤ簬鍙鍖栫珯鐐规樉绀�
- agvBasDevpDto.setAgvWaitPakin(agvWaitPakinList);
+ agvBasDevpDto.setAgvWaitPakin(agvWaitPakinList.get(0));
}
//濡傛灉娌℃湁鍏ュ簱閫氱煡妗ｏ紝鍒欒宸ヤ綔浣嶄负鍑哄簱浣滀笟
@@ -179,7 +179,7 @@
//鐢ㄤ簬鐢佃鏈烘樉绀�
agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
//鐢ㄤ簬鍙鍖栫珯鐐规樉绀�
- agvBasDevpDto.setAgvWrkDetl(agvWrkDetlList);
+ agvBasDevpDto.setAgvWrkDetl(agvWrkDetlList.get(0));
}
}
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;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a748016..00160ea 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -45,7 +45,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: tzskasrs
+ subject: 2378
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license222.lic
--
Gitblit v1.9.1