From 3c8e996db701f2744af261e876455754ad182b62 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 09 五月 2025 16:19:36 +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 | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 574564f..9c5553f 100644
--- a/BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj
+++ b/BLL/HStation.BLL.Assets.Core/HStation.BLL.Assets.Core.csproj
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
- <Nullable>enable</Nullable>
+ <Nullable>disable</Nullable>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -15,21 +15,33 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Remove="03-localclient\04-PipeLineRoughnessCoefficient\**" />
<Compile Remove="04-bll\02-Valve\02-AssetsPumpGroup\**" />
<Compile Remove="04-bll\02-Valve\02-PumpGroup\**" />
<Compile Remove="04-bll\02-Valve\04-AssetsPumpGroupAndMainMap\**" />
<Compile Remove="04-bll\02-Valve\04-PumpGroupAndMainMap\**" />
<Compile Remove="04-bll\10-Manufacturer\02-Mapping\**" />
+ <Compile Remove="04-bll\15-Tank\03-TankCoefficient\**" />
+ <Compile Remove="04-bll\15-Tank\04-TankPartMain\**" />
+ <Compile Remove="04-bll\15-Tank\05-TankMainAndPartMapping\**" />
+ <EmbeddedResource Remove="03-localclient\04-PipeLineRoughnessCoefficient\**" />
<EmbeddedResource Remove="04-bll\02-Valve\02-AssetsPumpGroup\**" />
<EmbeddedResource Remove="04-bll\02-Valve\02-PumpGroup\**" />
<EmbeddedResource Remove="04-bll\02-Valve\04-AssetsPumpGroupAndMainMap\**" />
<EmbeddedResource Remove="04-bll\02-Valve\04-PumpGroupAndMainMap\**" />
<EmbeddedResource Remove="04-bll\10-Manufacturer\02-Mapping\**" />
+ <EmbeddedResource Remove="04-bll\15-Tank\03-TankCoefficient\**" />
+ <EmbeddedResource Remove="04-bll\15-Tank\04-TankPartMain\**" />
+ <EmbeddedResource Remove="04-bll\15-Tank\05-TankMainAndPartMapping\**" />
+ <None Remove="03-localclient\04-PipeLineRoughnessCoefficient\**" />
<None Remove="04-bll\02-Valve\02-AssetsPumpGroup\**" />
<None Remove="04-bll\02-Valve\02-PumpGroup\**" />
<None Remove="04-bll\02-Valve\04-AssetsPumpGroupAndMainMap\**" />
<None Remove="04-bll\02-Valve\04-PumpGroupAndMainMap\**" />
<None Remove="04-bll\10-Manufacturer\02-Mapping\**" />
+ <None Remove="04-bll\15-Tank\03-TankCoefficient\**" />
+ <None Remove="04-bll\15-Tank\04-TankPartMain\**" />
+ <None Remove="04-bll\15-Tank\05-TankMainAndPartMapping\**" />
</ItemGroup>
<ItemGroup>
@@ -37,15 +49,23 @@
<Compile Remove="01-interface\03-IValveManage\IPumpGroupAndMainMap.cs" />
<Compile Remove="01-interface\03-IValveManage\IValveGroup.cs" />
<Compile Remove="01-interface\10-IManufacturer\IManufacturerMapping.cs" />
+ <Compile Remove="01-interface\15-ITank\IAssetsTankFactor.cs" />
+ <Compile Remove="01-interface\15-ITank\IAssetsTankMainAndPartMapping.cs" />
+ <Compile Remove="01-interface\15-ITank\IAssetsTankPartMain.cs" />
+ <Compile Remove="02-httpclient\15-Tank\AssetsTankCoefficient.cs" />
+ <Compile Remove="02-httpclient\15-Tank\AssetsTankMainAndPartMapping.cs" />
+ <Compile Remove="02-httpclient\15-Tank\AssetsTankPartMain.cs" />
<Compile Remove="03-localclient\03-Valve\ValveGroup.cs" />
<Compile Remove="03-localclient\03-Valve\ValveGroupAndMainMap.cs" />
<Compile Remove="03-localclient\10-Manufacturer\ManufacturerMapping.cs" />
+ <Compile Remove="03-localclient\15-Tank\AssetsTankCoefficient.cs" />
+ <Compile Remove="03-localclient\15-Tank\AssetsTankMainAndPartMapping.cs" />
+ <Compile Remove="03-localclient\15-Tank\AssetsTankPartMain.cs" />
<Compile Remove="04-bll\03-Adapting\AdaptingManage_Instance.cs" />
<Compile Remove="04-bll\05-Pipe\AdaptingManage_Instance.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\Dto\HStation.Dto.Assets.Core\HStation.Dto.Assets.Core.csproj" />
<ProjectReference Include="..\..\Vmo\HStation.Vmo.Assets.Core\HStation.Vmo.Assets.Core.csproj" />
<ProjectReference Include="..\HStation.BLL.Core\HStation.BLL.Core.csproj" />
</ItemGroup>
--
Gitblit v1.9.3