From be6fb1de960f7af129ab4b5d22025c84ce283f28 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 14:15:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
index 7ebb3f8..cdff842 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
@@ -1,8 +1,9 @@
 package com.yuanchu.mom.service;
 
-import com.yuanchu.mom.dto.FactoryDto;
-import com.yuanchu.mom.pojo.StandardTree;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.dto.FactoryDto;
+import com.yuanchu.mom.dto.SampleTypeDto;
+import com.yuanchu.mom.pojo.StandardTree;
 
 import java.util.List;
 
@@ -21,4 +22,6 @@
 
     int addStandardProduct(String ids, String tree);
 
+    List<SampleTypeDto> getStandardTree2();
+
 }

--
Gitblit v1.9.3