From 970e7b9336aeb7e35c2bbef18bb1d6c1be0f41f7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 20 八月 2024 09:29:06 +0800
Subject: [PATCH] 8.20合并代码
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
index 25fb187..e9eeb16 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
@@ -24,14 +24,14 @@
public interface InsOrderMapper extends BaseMapper<InsOrder> {
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
- IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, @Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory);
+ IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, QueryWrapper<SampleOrderDto> ew, String laboratory);
//淇敼妫�楠屼笅鍗曟暟鎹�
int upInsOrderParameter(InsOrder itemParameter);
String getLaboratoryCode(String name);
- IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew);
+ IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, QueryWrapper<SampleProductDto2> ew,Integer id);
IPage<CostStatisticsDto> selectCostStatistics(IPage<CostStatisticsDto> page, QueryWrapper<CostStatisticsDto> ew);
--
Gitblit v1.9.3