From 8267cbdb4dc96787e245a794f7ec6b4cadf7d532 Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期四, 23 五月 2024 16:47:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 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 ebba737..2805ef6 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,11 +1,12 @@ package com.yuanchu.mom.service; -import com.yuanchu.mom.dto.FactoryDto; -import com.yuanchu.mom.pojo.StandardProductList; -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; +import java.util.Map; /** * @author Administrator @@ -22,7 +23,8 @@ int addStandardProduct(String ids, String tree); -// 鏍规嵁鏍峰搧绫诲瀷杩涜鏍囧噯鏍戞洿鏂版搷浣� - void reTreeBySampleType(String sampleType); + List<SampleTypeDto> getStandardTree2(); + + int upStandardProducts(Map<String, Object> product); } -- Gitblit v1.9.3