ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -7,7 +7,10 @@
			using System.Threading.Tasks;
			using WIDESEAWCS_Core;
			using WIDESEAWCS_Core.BaseServices;
			<<<<<<< HEAD
			=======
			using WIDESEAWCS_DTO.TaskInfo;
			>>>>>>> main
			using WIDESEAWCS_Model.Models;

			namespace WIDESEAWCS_ITaskInfoService
			@@ -30,6 +33,8 @@
			WebResponseContent TaskCompleted(int taskNum=0,Dt_PackaxisTask? packaxisTask=null);
			//ç åç»æå¹¶ä¸ä¼ ç åå·¥ä½ç åæç»æ°æ®
			WebResponseContent BoxingInBound(string stationCode);
			<<<<<<< HEAD
			=======

			///// <summary>
			///// å é¤ç åä»»å¡
			@@ -39,5 +44,6 @@
			WebResponseContent PickaixsTaskDele(int PackTaskNum);


			>>>>>>> main
			}
			}