解决代码冲突更新WCS日志记录

wangxinhui

2026-03-07 d82252f08a32f5786ffe231b7fd301b6a60781d6

 项目代码/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
    }
}