From 2917cb5d06bcdf78327ce84ba5b9b36076adb4af Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 01 四月 2025 15:06:44 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
index a7812b5..f25e0c6 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.BasicTreeDto;
import com.ruoyi.basic.dto.FactoryDto;
+import com.ruoyi.basic.dto.ModelAddDto;
import com.ruoyi.basic.dto.SampleTypeDto;
import com.ruoyi.basic.pojo.StandardTree;
import org.springframework.web.multipart.MultipartFile;
@@ -20,11 +21,11 @@
List<BasicTreeDto> selectStandardTreeList();
- int addStandardTree(StandardTree standardTree);
+ int addStandardTree(ModelAddDto modelAddDto);
int delStandardTree(String tree);
- List<SampleTypeDto> getStandardTree2();
+ List<BasicTreeDto> getStandardTree2();
int upStandardProducts(Map<String, Object> product);
@@ -47,5 +48,5 @@
*/
boolean updateTreeSort(List<FactoryDto> list);
- int updateStandardTree(StandardTree standardTree);
+ int updateStandardTree(ModelAddDto modelAddDto);
}
--
Gitblit v1.9.3