From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
index cc1c24d..93fd9c3 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/HollowGlassRelationInfoService.java
@@ -12,6 +12,7 @@
import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
import java.util.List;
+import java.util.Map;
/**
* (HollowGlassRelationInfo)琛ㄦ湇鍔℃帴鍙�
@@ -55,6 +56,6 @@
OrderDetailsDTO queryProductNameByFlowCardId(String flowCardId, String productName, String customerName);
- List<GlassInfo> queryLackGlassByFlowCard(HollowBigStorageDetailsQueryVO query);
+ List<LackDetailsDTO> queryLackGlassByFlowCard(HollowBigStorageDetailsQueryVO query);
}
--
Gitblit v1.8.0