From 924d018e6e6f15effbd272cead5dff67cd3b93a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 16:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index 092e24c..ab1509d 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -44,5 +44,6 @@
equipment_name name
from lims_laboratory.instrument
left join lims_laboratory.classify c on c.id = instrument.classify_id
+ where conditions in(1,5)
</select>
</mapper>
--
Gitblit v1.9.3