From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
index 678d663..1423320 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
@@ -3,6 +3,8 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +21,7 @@
*/
public interface InspectionProductListMapper extends BaseMapper<InspectionProductList> {
- //娣诲姞妫�楠岄」鐩�
- int addInspectionProductList(List<InspectionProductList> list);
- //鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鐩�
- List<InspectionProductList> selectByMaterId(Integer id);
+ //鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
+ List<InspectionProductListVo> selectByMaterId(Integer id);
}
--
Gitblit v1.9.3