From 58a75277a83e48baa8ff9906e27975960659ff8a Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期四, 16 五月 2024 14:53:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java index c30ce41..5539cd5 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java @@ -1,12 +1,12 @@ package com.yuanchu.mom.service; import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.extension.service.IService; import com.yuanchu.mom.pojo.InsSample; import com.yuanchu.mom.pojo.StandardProductList; -import com.baomidou.mybatisplus.extension.service.IService; -import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * @author Administrator @@ -21,6 +21,6 @@ List<StandardProductList> selectStandardProductList(InsSample insSample); - List<StandardProductList> selectStandardProductListByMethodId(Integer id); + Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page); } -- Gitblit v1.9.3