liulijun
2026-03-20 1c631b345aae30bb6aa7e9dc8d856a0f40d5f1e3
项目代码/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs
@@ -24,8 +24,6 @@
        {
            return Service.TaskCompleted(taskNum);
        }
<<<<<<< HEAD
=======
        [HttpPost, Route("PickaixsTaskDele")]
        public WebResponseContent PickaixsTaskDele(int PackTaskNum)
@@ -33,6 +31,5 @@
            return Service.PickaixsTaskDele(PackTaskNum);
        }
>>>>>>> main
    }
}