From 7dcd8da0f2467d077551ddd39f33be5836dd80a9 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期四, 12 三月 2026 10:04:25 +0800
Subject: [PATCH] 取消老厂排程单信息中物料编号的合并

---
 项目代码/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackDetailService.cs |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackDetailService.cs"
index e125a2a..6190341 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackDetailService.cs"
@@ -10,9 +10,6 @@
 {
     public interface IStationPackDetailService : IService<Dt_StationPackDetail>
     {
-<<<<<<< HEAD
-=======
 
->>>>>>> main
     }
 }

--
Gitblit v1.9.3