From 80ea05da0c43c2ae14e2d8cf8d284d96d9a8f1f5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 06 八月 2024 19:08:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java |    7 +------
 1 files changed, 1 insertions(+), 6 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 5144caa..55b0d48 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,7 +24,7 @@
 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);
@@ -53,9 +53,4 @@
     List<Map<Integer, Object>> selectReportModelByOrderId(@Param("id") Integer id, @Param("laboratory") String laboratory);
 
     String seldepLimsId(int depLimsId);
-
-    Map<String, Object> getDeviceMessage(@Param("ip")String ip,
-                                         @Param("inspectionItem") String inspectionItem,
-                                         @Param("inspectionItemSubclass") String inspectionItemSubclass,
-                                         @Param("sample") String sample);
 }
\ No newline at end of file

--
Gitblit v1.9.3