From aac0fb36d6b6762f8f28827be417b6dc97e7e34e Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期一, 13 五月 2024 16:30:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java index 41f1913..88d97ae 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java @@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.dto.InsOrderPlanDTO; -import com.yuanchu.mom.dto.SampleOrderDto; import com.yuanchu.mom.dto.SampleProductDto; import com.yuanchu.mom.pojo.InsSample; import com.yuanchu.mom.vo.InsOrderPlanVO; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -26,6 +24,8 @@ List<SampleProductDto> selectSampleProductListByOrderId(Integer id); List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory); + + String getSampleEn(String sample); } -- Gitblit v1.9.3