From b40f6e7f21c5708c72cdce913631da623bef5d49 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 23 十二月 2024 21:05:01 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
index 12ac797..e0ff5c3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -95,7 +95,6 @@
WebResponseContent OutboundTaskCompleted(int taskNum);
/// <summary>
-<<<<<<< Updated upstream
/// 娴嬭瘯鏋堕��搴�
/// </summary>
/// <param name="backModel"></param>
@@ -103,8 +102,6 @@
MesResponseContent TestReturnStock(TestToolBackModel backModel);
/// <summary>
-=======
->>>>>>> Stashed changes
/// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
--
Gitblit v1.9.3