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_TaskInfoService/PackaxisTaskService.cs | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs"
index 19e19c2..397d188 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs"
@@ -14,7 +14,10 @@
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;
@@ -247,6 +250,8 @@
return WebResponseContent.Instance.Error(ex.Message);
}
}
+<<<<<<< HEAD
+=======
/// <summary>
/// 鍒犻櫎鐮佸灈浠诲姟淇℃伅
/// </summary>
@@ -281,5 +286,6 @@
}
+>>>>>>> main
}
}
--
Gitblit v1.9.3