Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2024-12-20 ab65b0ac21e7fabfd8548538142d9a1b66a2ad3d

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user

@@ -13,6 +13,9 @@
    <Compile Update="01-home\03-property\HomeXhsProjectPropertyCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-home\04-title\XhsProjectHomeTitleCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\01-import\00-core\ImportXhsProjectDlg.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -175,28 +178,10 @@
    <Compile Update="03-simulation\07-matching\09-Tank\TankSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\10-Meter\MeterSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\10-Meter\SimulationMeterSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\11-Flowmeter\FlowmeterSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\11-Flowmeter\SimulationFlowmeterSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\12-Hydrant\HydrantSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\12-Hydrant\SimulationHydrantSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\13-Pressmeter\PressmeterSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\13-Pressmeter\SimulationPressmeterSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\14-Blunthead\BluntheadSingleMatchingForm.cs">
@@ -211,32 +196,23 @@
    <Compile Update="03-simulation\07-matching\15-Translation\TranslationSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\16-meter\AssetsMeterSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\17-compressor\CompressorChartShowDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\17-compressor\CompressorSingleMatchingCtrl.cs">
    <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs">
    <Compile Update="03-simulation\07-matching\17-compressor\CompressorChartShowDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\18-exchanger\ExchangerChartShowDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\21-cooling\AssetsCoolingSingleMatchingCtrl.cs">
      <SubType>UserControl</SubType>