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

Shuxia Ning

2024-12-02 13e69c09c5ac97e0294d64617dfb934e34bb4264

 WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj

@@ -23,15 +23,15 @@
    <Compile Remove="01-pump\AddPumpProductMainDlg - 复制.Designer.cs" />
    <Compile Remove="01-pump\PumpProductMainPanel - 复制.cs" />
    <Compile Remove="01-pump\PumpProductMainPanel - 复制.Designer.cs" />
    <Compile Remove="12-Equipment\02-main\01-EditPumpPartProp\EquipmentProductListBox.cs" />
    <Compile Remove="12-Equipment\02-main\01-EditPumpPartProp\EquipmentProductListBox.Designer.cs" />
    <Compile Remove="12-Equipment\02-main\01-EditPumpPartProp\PropGroupChoiceViewModel.cs" />
    <Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.cs" />
    <Compile Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.Designer.cs" />
    <Compile Remove="12-package\02-main\01-EditPumpPartProp\PropGroupChoiceViewModel.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 复制.resx" />
    <EmbeddedResource Remove="01-pump\PumpProductMainPanel - 复制.resx" />
    <EmbeddedResource Remove="12-Equipment\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" />
    <EmbeddedResource Remove="12-package\02-main\01-EditPumpPartProp\EquipmentProductListBox.resx" />
  </ItemGroup>

  <ItemGroup>
@@ -158,22 +158,28 @@
    <Compile Update="11-compressor\03-coefficient\SetCompressorCoefficientDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-Equipment\01-series\AddAssetsEquipmentSeriesDlg.cs">
    <Compile Update="12-package\01-series\AddAssetsPackageSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-Equipment\01-series\EquipmentTreeListCtrl.cs">
    <Compile Update="12-package\01-series\PackageTreeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-Equipment\01-series\EditAssetsEquipmentSeriesDlg.cs">
    <Compile Update="12-package\01-series\EditAssetsPackageSeriesDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-Equipment\02-main\AddAssetsEquipmentMainDlg.cs">
    <Compile Update="12-package\02-main\EditAssetsPackageMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-Equipment\02-main\EditAssetsEquipmentMainDlg.cs">
    <Compile Update="12-package\02-main\AddAssetsPackageMainDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-Equipment\EquipmentManageMainPage.cs">
    <Compile Update="12-package\EditPackagePartPropDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-package\PackageManageMainPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-package\PackageProductListBox.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">
@@ -191,7 +197,7 @@
  </ItemGroup>

  <ItemGroup>
    <Folder Include="12-Equipment\02-main\01-EditPumpPartProp\" />
    <Folder Include="12-package\02-main\01-EditPumpPartProp\" />
  </ItemGroup>

</Project>