From eb975b40828b3a930fb38b75c739a7385b14ee12 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 14:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 116b453..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
@@ -25,7 +25,7 @@
int delStandardTree(String tree);
- List<SampleTypeDto> getStandardTree2();
+ List<BasicTreeDto> getStandardTree2();
int upStandardProducts(Map<String, Object> product);
@@ -48,5 +48,5 @@
*/
boolean updateTreeSort(List<FactoryDto> list);
- int updateStandardTree(StandardTree standardTree);
+ int updateStandardTree(ModelAddDto modelAddDto);
}
--
Gitblit v1.9.3