From 555ff988376b8650455547d0b6ff7f12f4ae2c63 Mon Sep 17 00:00:00 2001 From: luoyisheng <yangdongji@argo-ai.cn> Date: 星期三, 26 三月 2025 17:27:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java index 64bff39..dabcf05 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java @@ -9,6 +9,7 @@ import com.sinata.system.domain.query.MwCheckoutRecordItemQuery; import com.sinata.system.domain.query.MwTransitRecordQuery; import com.sinata.system.domain.query.TransformQuery; +import com.sinata.system.domain.query.TransitRecordQuery; import com.sinata.system.domain.vo.MwCheckoutRecordVO; import com.sinata.system.domain.vo.MwCollectRecordVO; import com.sinata.system.domain.vo.MwMedicalWasteBoxVO; @@ -19,7 +20,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.time.LocalDate; -import java.util.List; import java.util.List; /** @@ -67,9 +67,10 @@ * 运输记录详情 * * @param id + * @param query * @return */ - MwTransitRecordVO transitDetail(Long id); + MwTransitRecordVO transitDetail(TransitRecordQuery query); /** * 运输记录详情分页列表 @@ -77,7 +78,7 @@ * @param query * @return */ - PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(MwTransitRecordQuery query); + PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(TransitRecordQuery query); /** * 转运记录导出 -- Gitblit v1.7.1