From 19c9e29273e8e751847d9dcb06b346dede48d2c8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 15:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index 3aa5914..5031258 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -46,7 +46,7 @@
left join lims_laboratory.classify c on c.id = instrument.classify_id
where conditions in(1,5)
</select>
- <select id="getInstrument" resultType="com.yuanchu.limslaboratory.pojo.Instrument">
- select id,equipment_name name from instrument where 1=1 and state=1 and conditions=5
+ <select id="getInstrument" resultType="map">
+ select id,equipment_name equipmentName from instrument where 1=1 and state=1 and conditions=5
</select>
</mapper>
--
Gitblit v1.9.3