From f2392d984123a1402d6c9bab9e5452c7becc8d22 Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:10:48 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu

---
 项目代码/WCS/WCSServices/WIDESEAWCS_IPackInfoRepository/IStationPackDetailRepository.cs |    3 +++
 1 files changed, 3 insertions(+), 0 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 33d281f..6359de3 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,6 +10,9 @@
 {
     public interface IStationPackDetailRepository : IRepository<Dt_StationPackDetail>
     {
+<<<<<<< HEAD
+=======
 
+>>>>>>> main
     }
 }

--
Gitblit v1.9.3