From c5138faa1c4771bfbc19de5b257e7c129c081cb8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 13:30:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java
index 38b90bd..27a06a0 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/SpecificationsMapper.java
@@ -1,11 +1,9 @@
package com.yuanchu.limslaboratory.mapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Specifications;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.limslaboratory.vo.ListSpecificationsInformation;
import java.util.Map;
import java.util.Objects;
@@ -20,5 +18,11 @@
*/
public interface SpecificationsMapper extends BaseMapper<Specifications> {
- IPage<ListSpecificationsInformation> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page);
+ Map<String, Object> selectSNameSNName(int materialId);
+
+ IPage<Map<String, Objects>> listSpecificationsInformation(String specificationsName, String serialNumberId, Page<Objects> page);
+
+
+ //鏍规嵁鍨嬪彿id鏌ヨ鐗╂枡鍚嶇О
+ String selMateName(Integer standardId);
}
--
Gitblit v1.9.3