From 88cbf1a8c50a15f35dd78a50adc43e71a6530775 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 26 五月 2025 16:22:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassRelationInfoMapper.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassRelationInfoMapper.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassRelationInfoMapper.java index 0367c10..44f7fc8 100644 --- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassRelationInfoMapper.java +++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/mapper/HollowGlassRelationInfoMapper.java @@ -4,6 +4,7 @@ import com.mes.hollow.entity.HollowGlassRelationInfo; import com.mes.hollow.entity.dto.HollowGlassDetailsDTO; import com.mes.hollow.entity.dto.LackDetailsDTO; +import com.mes.hollow.entity.dto.OrderDetailsDTO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -34,6 +35,6 @@ * @param flowCardId * @return */ - String queryProductNameByFlowCardId(@Param("flowCardId") String flowCardId); + OrderDetailsDTO queryProductNameByFlowCardId(@Param("flowCardId") String flowCardId); } -- Gitblit v1.8.0