From 75c4ed0d3c640e66bc95dc170de52b753629e3ed Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:09:14 +0800
Subject: [PATCH] 最新
---
项目代码/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs"
index 8dfe4f1..40d3c7a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs"
@@ -24,6 +24,8 @@
{
return Service.TaskCompleted(taskNum);
}
+<<<<<<< HEAD
+=======
[HttpPost, Route("PickaixsTaskDele")]
public WebResponseContent PickaixsTaskDele(int PackTaskNum)
@@ -31,5 +33,6 @@
return Service.PickaixsTaskDele(PackTaskNum);
}
+>>>>>>> main
}
}
--
Gitblit v1.9.3