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

lixiaojun

2024-10-18 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user

@@ -4,16 +4,16 @@
    <Compile Update="01-scene\AddHydroSceneDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-property\05-curve\HydroCurveViewCtrl.cs">
    <Compile Update="03-property\06-curve\HydroCurveViewCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-property\05-curve\HydroCurveViewDlg.cs">
    <Compile Update="03-property\06-curve\HydroCurveViewDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-property\05-curve\SetHydroCurveCtrl.cs">
    <Compile Update="03-property\06-curve\SetHydroCurveCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-property\05-curve\SetHydroCurveDlg.cs">
    <Compile Update="03-property\06-curve\SetHydroCurveDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-parter\00-core\HydroParterListCtrl.cs">
@@ -22,13 +22,46 @@
    <Compile Update="04-parter\00-core\HydroParterListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-parter\01-junction\HydroJunctionListCtrl.cs">
    <Compile Update="04-parter\02-node\02-junction\00-core\HydroJunctionListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-parter\03-nozzle\HydroNozzleListCtrl.cs">
    <Compile Update="04-parter\02-node\02-junction\02-emitter\02-nozzle\HydroNozzleListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="05-q3d\HydroQ3dViewPage.cs">
    <Compile Update="05-check\01-control\HydroCheckResultCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="06-q3d\HydroQ3dViewPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="09-mark\SetHydroMarkCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="09-mark\SetHydroMarkDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="09-mark\SetHydroMarkPureCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="11-prefix\00-core\SetHydroCalcuPrefixCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="11-prefix\01-waterbox\SetWaterboxCalcuPrefixCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="11-prefix\01-waterbox\SetWaterboxCalcuPrefixListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="11-prefix\02-pump\SetPumpCalcuPrefixCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="11-prefix\02-pump\SetPumpCalcuPrefixListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="11-prefix\03-nozzle\SetNozzleCalcuPrefixCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="11-prefix\03-nozzle\SetNozzleCalcuPrefixListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
  </ItemGroup>