From 916f102b39d6f2e1ce591fd5cdd4204ee6ec9ab0 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 11 九月 2024 09:23:38 +0800
Subject: [PATCH] 冲突方法改名

---
 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
index 17381da..fae12ff 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
@@ -43,7 +43,7 @@
      * 鏍规嵁涓嶅悓宸ヨ壓鏌ヨ鍗冲皢涓婄墖鐨勬暟鎹�
      * @return List<Tasking>
      */
-    Tasking selectTaskLoad(Tasking tasking);
+    Tasking selectTasking(Tasking tasking);
     /**
      * 鏍规嵁鏍囧噯妯″紡鐨勪换鍔￠『搴忚幏鍙栫幓鐠冩暟鎹�
      * @return List<Tasking>

--
Gitblit v1.8.0