From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj b/BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj
index 75ca98c..4dba894 100644
--- a/BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj
+++ b/BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj
@@ -15,15 +15,22 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="04-bll\02-ValveMange\02-AssetsPumpGroup\**" />
     <Compile Remove="04-bll\02-ValveMange\02-PumpGroup\**" />
+    <Compile Remove="04-bll\02-ValveMange\04-AssetsPumpGroupAndMainMap\**" />
     <Compile Remove="04-bll\02-ValveMange\04-PumpGroupAndMainMap\**" />
+    <EmbeddedResource Remove="04-bll\02-ValveMange\02-AssetsPumpGroup\**" />
     <EmbeddedResource Remove="04-bll\02-ValveMange\02-PumpGroup\**" />
+    <EmbeddedResource Remove="04-bll\02-ValveMange\04-AssetsPumpGroupAndMainMap\**" />
     <EmbeddedResource Remove="04-bll\02-ValveMange\04-PumpGroupAndMainMap\**" />
+    <None Remove="04-bll\02-ValveMange\02-AssetsPumpGroup\**" />
     <None Remove="04-bll\02-ValveMange\02-PumpGroup\**" />
+    <None Remove="04-bll\02-ValveMange\04-AssetsPumpGroupAndMainMap\**" />
     <None Remove="04-bll\02-ValveMange\04-PumpGroupAndMainMap\**" />
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Remove="01-interface\03-IValveManage\IAssetsPumpGroupAndMainMap.cs" />
     <Compile Remove="01-interface\03-IValveManage\IPumpGroupAndMainMap.cs" />
     <Compile Remove="01-interface\03-IValveManage\IValveGroup.cs" />
     <Compile Remove="03-localclient\03-ValveManage\ValveGroup.cs" />

--
Gitblit v1.9.3