From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java | 10 ----------
1 files changed, 0 insertions(+), 10 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 39d08e7..a643b8b 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
@@ -18,7 +18,6 @@
List<FactoryDto> selectStandardTreeList();
-
int addStandardTree(StandardTree standardTree);
int delStandardTree(String tree);
@@ -40,13 +39,4 @@
void resetTreeOfAsk(String tree, Integer standardId);
void importWorkstationExcel(MultipartFile file);
-
- /**
- * 鏍囧噯鏁版帓搴�
- * @param list
- * @return
- */
- boolean updateTreeSort(List<FactoryDto> list);
-
- int updateStandardTree(StandardTree standardTree);
}
--
Gitblit v1.9.3