From 1a2e9c7cbab7096222b0b75ada21590877db2cf0 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期五, 27 三月 2026 14:34:56 +0800
Subject: [PATCH] 修复出库详情的状态显示异常

---
 项目代码/WCS/WCSServices/WIDESEAWCS_IPackInfoRepository/IStationPackDetailRepository.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_IPackInfoRepository/IStationPackDetailRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoRepository/IStationPackDetailRepository.cs"
index 6359de3..33d281f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoRepository/IStationPackDetailRepository.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_IPackInfoRepository/IStationPackDetailRepository.cs"
@@ -10,9 +10,6 @@
 {
     public interface IStationPackDetailRepository : IRepository<Dt_StationPackDetail>
     {
-<<<<<<< HEAD
-=======
 
->>>>>>> main
     }
 }

--
Gitblit v1.9.3