From 9212801fbac08dd12b8205c217bdeb925529ab7c Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期四, 27 二月 2025 09:55:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowBigStorageCageDetailsService.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowBigStorageCageDetailsService.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowBigStorageCageDetailsService.java index 2b94b2c..b8542cf 100644 --- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowBigStorageCageDetailsService.java +++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowBigStorageCageDetailsService.java @@ -6,6 +6,7 @@ import com.mes.hollow.entity.dto.*; import java.util.List; +import java.util.Map; /** * (HollowBigStorageCageDetails)琛ㄦ湇鍔℃帴鍙� @@ -26,7 +27,7 @@ List<HollowBigStorageCageDetails> queryOutGlassList(String flowCardId, int cell); - List<BigStorageVO> queryHollowbigStorageCageDetail(); + Map<Integer, List<BigStorageVO>> queryHollowbigStorageCageDetail(); /** * 鍙栧嚭姣忕粍鐜荤拑鍗犵敤绗煎瓙鐨勬牸瀛愬苟璁$畻鏍煎瓙鍐呯殑鏈�澶х粍搴忓彿 -- Gitblit v1.8.0