项目代码/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs
@@ -15,10 +15,7 @@ using WIDESEAWCS_Core.BaseServices; using WIDESEAWCS_Core.Enums; using WIDESEAWCS_Core.Helper; <<<<<<< HEAD ======= using WIDESEAWCS_DTO.TaskInfo; >>>>>>> main using WIDESEAWCS_IBasicInfoRepository; using WIDESEAWCS_IPackInfoRepository; using WIDESEAWCS_ITaskInfoRepository; @@ -255,8 +252,6 @@ return WebResponseContent.Instance.Error(ex.Message); } } <<<<<<< HEAD ======= /// <summary> /// 鍒犻櫎鐮佸灈浠诲姟淇℃伅 /// </summary> @@ -289,9 +284,6 @@ } return content; } >>>>>>> main } public class MDCount {
