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/mapper/InsSampleMapper.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
index e5f1577..ed22a65 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
@@ -14,6 +14,7 @@
import com.ruoyi.inspect.vo.SampleVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
import java.time.LocalDateTime;
import java.util.List;
@@ -46,7 +47,7 @@
List<SampleProductDto> selectSampleProductListByOrderId2(Integer id);
- List<SampleProductDto3> selectSampleProductListByOrderId3(List<Integer> ids);
+ List<SampleProductDto3> selectSampleProductListByOrderId3(@Param("ids") List<Integer> ids);
List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);
--
Gitblit v1.9.3