From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
index 5efb038..59e305d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
@@ -33,7 +33,8 @@
Map<String, Object> getInsOrderAndSample(Integer id, String laboratory);
- Map<String, Object> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto);
+ List<SampleProductDto2> selectSampleAndProductByOrderId(SampleProductDto2 sampleProductDto);
+
List<Map<String, Object>> viewDetails(Map<String,Object> map);
void exportChecked(Map<String,Object> data, HttpServletResponse response);
--
Gitblit v1.9.3