From ab65b0ac21e7fabfd8548538142d9a1b66a2ad3d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 十二月 2024 13:14:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
index 72bcc80..c0bad2d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -227,6 +227,18 @@
 		<Compile Update="03-simulation\07-matching\09-Tank\TankChartShowDlg.cs" />
 		<Compile Update="03-simulation\07-matching\09-Tank\SimulationTankSingleMatchingDlg.cs" />
 		<Compile Update="03-simulation\07-matching\09-Tank\TankSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\07-matching\17-compressor\AssetsCompressorSingleMatchingCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\17-compressor\AssetsCompressorSingleMatchingDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\18-exchanger\AssetsExchangerSingleMatchingCtrl.cs">
+		  <SubType>UserControl</SubType>
+		</Compile>
+		<Compile Update="03-simulation\07-matching\18-exchanger\AssetsExchangerSingleMatchingDlg.cs">
+		  <SubType>Form</SubType>
+		</Compile>
 		<Compile Update="03-simulation\07-matching\18-pressmeter\AssetsPressmeterSingleMatchingCtrl.cs">
 		  <SubType>UserControl</SubType>
 		</Compile>
@@ -263,12 +275,6 @@
 		<Compile Update="03-simulation\07-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.cs" />
 		<Compile Update="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs" />
 		<Compile Update="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs" />
-		<Compile Update="03-simulation\07-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs" />
-		<Compile Update="03-simulation\07-matching\17-compressor\CompressorChartShowDlg.cs" />
-		<Compile Update="03-simulation\07-matching\17-compressor\CompressorSingleMatchingCtrl.cs" />
-		<Compile Update="03-simulation\07-matching\18-exchanger\ExchangerChartShowDlg.cs" />
-		<Compile Update="03-simulation\07-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs" />
-		<Compile Update="03-simulation\07-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs" />
 		<Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
 		<Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs" />
 		<Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs" />

--
Gitblit v1.9.3