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

yangyin

2024-08-20 98e49c0dd42840a094837f7acae532bc237a719a

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

@@ -19,12 +19,12 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg.cs" />
    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg.Designer.cs" />
    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.cs" />
    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.Designer.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg.resx" />
    <EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.resx" />
  </ItemGroup>

  <ItemGroup>
@@ -56,6 +56,7 @@
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\BLL\HStation.BLL.Assets.Core\HStation.BLL.Assets.Core.csproj" />
    <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
    <ProjectReference Include="..\..\Hydro\HStation.Hydro.Core\HStation.Hydro.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Bimface.Core\HStation.WinFrmUI.Bimface.Core.csproj" />
@@ -65,15 +66,30 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Update="02-project\01-import\00-core\ImportXhsProjectDlg - 复制.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="02-project\04-dlg\EditProjectDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-scheme\03-hydraulic-simulation\XhsSchemeHydraulicSimulationPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\02-asset-mgr\XhsSchemeAssetMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\04-scheme-mgr\02-comparison\SelectSchemeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-scheme\04-scheme-mgr\02-comparison\XhsSchemeComparisonPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\XhsSchemeMultiMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak2.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
      <AutoGen>True</AutoGen>