From 636af7d0ed40549da7182569175e69068e5e937d Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期三, 09 八月 2023 09:24:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 laboratory-server/src/main/resources/mapper/InstrumentMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index ccf1794..ee31f57 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -19,4 +19,7 @@
         </if>
         AND i.`user_id` = u.`id`
     </select>
+    <select id="selectInstrument" resultType="Map">
+        select id,equipment_name from lims_laboratory.instrument
+    </select>
 </mapper>

--
Gitblit v1.9.3