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_PackInfoService/StationPackDetailService.cs |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackDetailService.cs"
index 9c4e173..40fe065 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackDetailService.cs"
@@ -22,12 +22,7 @@
     {
         public StationPackDetailService(IStationPackDetailRepository BaseDal) : base(BaseDal)
         {
-<<<<<<< HEAD
-        }
-=======
 
         }
-
->>>>>>> main
     }
 }

--
Gitblit v1.9.3