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_IPackInfoService/IStationPackInfoService.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_IPackInfoService/IStationPackInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackInfoService.cs"
index 6bdabb8..0fdf0fa 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackInfoService.cs"
@@ -3,7 +3,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+<<<<<<< HEAD
+=======
 using WIDESEAWCS_Core;
+>>>>>>> main
 using WIDESEAWCS_Core.BaseServices;
 using WIDESEAWCS_Model.Models;
 
@@ -11,11 +14,14 @@
 {
     public interface IStationPackInfoService : IService<Dt_StationPackInfo>
     {
+<<<<<<< HEAD
+=======
         /// <summary>
         /// 鎵嬪姩娓呯┖鐮佸灈鎵ц宸ヤ綅鏁版嵁
         /// </summary>
         /// <param name="taskNum"></param>
         /// <returns></returns>
         WebResponseContent ManualClearPalletStationData(string StationCode);
+>>>>>>> main
     }
 }

--
Gitblit v1.9.3