From 71a860affbf97e7be13a2059b6cb001bfd368adb Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期日, 28 四月 2024 14:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
index 1063ef0..e5acab7 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardTreeMapper.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.mapper;
import com.yuanchu.mom.dto.FactoryDto;
+import com.yuanchu.mom.pojo.StandardMethodList;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -17,9 +18,15 @@
List<FactoryDto> selectStandardTreeList();
+ List<StandardTree> selectStandardTreeList2(String sampleType);
+
StandardProductList selectStandardProductById(Integer id);
- List<StandardProductList> getStandardProductListBySample(String sample);
+ List<StandardProductList> getStandardProductListBySample(String sampleType);
+
+ List<StandardMethodList> getStandardMethodListBySample(String sampleType);
+
+ List<StandardProductList> selectStandardProductListByTree(String tree1, String tree2);
}
--
Gitblit v1.9.3