From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
index 00c22c1..8c81d93 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
@@ -35,10 +35,6 @@
 
     Integer updateEquipmentPointInformation(Instrument instrument);
 
-    /**
-     * 鏌ヨ鎵�鏈夎澶囦俊鎭�
-     * @return
-     */
-    List<Map> selectInstrument();
+
 
 }

--
Gitblit v1.9.3