From d82252f08a32f5786ffe231b7fd301b6a60781d6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 07 三月 2026 17:56:58 +0800
Subject: [PATCH] 解决代码冲突更新WCS日志记录
---
项目代码/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackInfoService.cs | 6 ------
1 files changed, 0 insertions(+), 6 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 0fdf0fa..6bdabb8 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,10 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-<<<<<<< HEAD
-=======
using WIDESEAWCS_Core;
->>>>>>> main
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Model.Models;
@@ -14,14 +11,11 @@
{
public interface IStationPackInfoService : IService<Dt_StationPackInfo>
{
-<<<<<<< HEAD
-=======
/// <summary>
/// 鎵嬪姩娓呯┖鐮佸灈鎵ц宸ヤ綅鏁版嵁
/// </summary>
/// <param name="taskNum"></param>
/// <returns></returns>
WebResponseContent ManualClearPalletStationData(string StationCode);
->>>>>>> main
}
}
--
Gitblit v1.9.3