From 2f8a5053ad00f50d5bcf33715188dfa21f03b52e Mon Sep 17 00:00:00 2001
From: liqionghai <1>
Date: Sun, 24 Aug 2025 13:51:26 +0800
Subject: [PATCH] 1

---
 .../MyCode.Project.Services.csproj              | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj b/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
index 45ac2ad..8a0b90f 100644
--- a/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
+++ b/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
@@ -115,25 +115,22 @@
     <Compile Include="BLL\WebSocketBLL.cs" />
     <Compile Include="Implementation\AnsyDataProcessService.cs" />
     <Compile Include="Implementation\ApiLogService.cs" />
-<<<<<<< HEAD
-    <Compile Include="Implementation\ZhuBinService.cs" />
+
     <Compile Include="Implementation\PurOrderService.cs" />
-=======
+
     <Compile Include="Implementation\PrdOrderService.cs" />
-    <Compile Include="Implementation\LiQiongHaiService.cs" />
->>>>>>> fa17cd7e027b15543cc15e73cd9d1e8e7d5c05e9
+
     <Compile Include="Implementation\YuyuboService.cs" />
     <Compile Include="Implementation\ReportService.cs" />
     <Compile Include="Implementation\QueueProcessService.cs" />
     <Compile Include="Implementation\WebSocketService.cs" />
     <Compile Include="IServices\IAnsyDataProcessService.cs" />
-<<<<<<< HEAD
+
     <Compile Include="IServices\IPurOrderService.cs" />
-    <Compile Include="IServices\IZhuBinService.cs" />
-=======
-    <Compile Include="IServices\ILiQiongHaiService.cs" />
+
+
     <Compile Include="IServices\IPrdOrderService.cs" />
->>>>>>> fa17cd7e027b15543cc15e73cd9d1e8e7d5c05e9
+
     <Compile Include="IServices\IYuyuboService.cs" />
     <Compile Include="IServices\IApiLogService.cs" />
     <Compile Include="IServices\IItemListService.cs" />