From f4bf35513c50f86556d5e3c75a037052f53c971d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 09 十月 2024 17:58:10 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
index a43b11b..5c2c97f 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Yw.WinFrmUI.Phart.Core.csproj
@@ -8,20 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="01-perform\00-core\01-base\**" />
-    <Compile Remove="01-perform\00-core\02-xtr-diagram\**" />
     <Compile Remove="01-perform\01-pump-chart\05-import\**" />
     <Compile Remove="01-perform\01-cubic\**" />
-    <EmbeddedResource Remove="01-perform\00-core\01-base\**" />
-    <EmbeddedResource Remove="01-perform\00-core\02-xtr-diagram\**" />
     <EmbeddedResource Remove="01-perform\01-pump-chart\05-import\**" />
     <EmbeddedResource Remove="01-perform\01-cubic\**" />
-    <None Remove="01-perform\00-core\01-base\**" />
-    <None Remove="01-perform\00-core\02-xtr-diagram\**" />
     <None Remove="01-perform\01-pump-chart\05-import\**" />
     <None Remove="01-perform\01-cubic\**" />
-    <Page Remove="01-perform\00-core\01-base\**" />
-    <Page Remove="01-perform\00-core\02-xtr-diagram\**" />
     <Page Remove="01-perform\01-pump-chart\05-import\**" />
     <Page Remove="01-perform\01-cubic\**" />
   </ItemGroup>
@@ -43,7 +35,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="01-perform\00-core\02-xtr-diagram\02-\XtrPerformCurveDiagram2d.cs" />
     <Compile Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.cs" />
     <Compile Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelCtrl.designer.cs" />
     <Compile Include="01-perform\01-pump-chart\05-import\01-excel\ImportPumpPerform2dByExcelDlg.cs" />
@@ -75,8 +66,8 @@
   <ItemGroup>
     <Folder Include="01-perform\01-pump-chart\03-chart-view\" />
     <Folder Include="01-perform\01-pump-chart\05-import\02-picture%28寰呮仮澶嶏紝闇�寮曠敤鍗曚綅%29\" />
+    <Folder Include="01-perform\01-pump-chart\99-calculate\" />
     <Folder Include="01-perform\02-valve-chart\03-chart-view\" />
-    <Folder Include="鍚庣画鍐嶆娊璞℃洸绾挎帶浠禱" />
   </ItemGroup>
 
   <ItemGroup>

--
Gitblit v1.9.3