From 81946b468aff97b96fe50186246d3a853ce79b1b Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期五, 06 三月 2026 11:38:48 +0800
Subject: [PATCH] 增加已有任务超时提示在任务完成后自动清除

---
 项目代码/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj |    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_PackInfoService/WIDESEAWCS_PackInfoService.csproj" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj"
index 0896a26..d099901 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj"
@@ -7,7 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+<<<<<<< HEAD
     <ProjectReference Include="..\WIDESEAWCS_IPackInfoService\WIDESEAWCS_IPackInfoService.csproj" />
+=======
+    <ProjectReference Include="..\WIDESEAWCS_IBasicInfoRepository\WIDESEAWCS_IBasicInfoRepository.csproj" />
+    <ProjectReference Include="..\WIDESEAWCS_IPackInfoService\WIDESEAWCS_IPackInfoService.csproj" />
+    <ProjectReference Include="..\WIDESEAWCS_ITaskInfoRepository\WIDESEAWCS_ITaskInfoRepository.csproj" />
+>>>>>>> main
   </ItemGroup>
 
 </Project>

--
Gitblit v1.9.3