From 78c62a33671bdcfb0f2019c520f807a4c56fc741 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 07 八月 2023 09:02:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
index 64b717a..944bd9d 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -19,4 +21,8 @@
public interface InstrumentMapper extends BaseMapper<Instrument> {
IPage<Map<String, Object>> getListInstrumentInformation(Integer conditions,Boolean whetherWhether, String numberOrNameOrSpecifications, Integer classifyId, Page<Objects> page);
+
+ //鏌ヨ鎵�鏈夎澶囦俊鎭�
+ List<Map> selectInstrument();
+
}
--
Gitblit v1.9.3