From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 9d492b5..14f5c05 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
@@ -5,6 +5,7 @@
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -33,4 +34,10 @@
Instrument getIdInstrumentInformation(Integer instrumentId);
Integer updateEquipmentPointInformation(Instrument instrument);
+
+ /**
+ * 鏌ヨ鎵�鏈夎澶囦俊鎭�
+ * @return
+ */
+ List<Map> selectInstrument();
}
--
Gitblit v1.9.3