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_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