解决冲突

lixiaojun

2024-12-09 d1b5c5bc56850b4f10d965e8cecf347b86bb8592

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

@@ -88,11 +88,14 @@
    <Compile Update="03-simulation\01-property\SimulationPropertyCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\02-bimface\XhsProjectSimulationBimfaceCtrl.cs">
    <Compile Update="03-simulation\02-bimface\SimulationBimfaceCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\00-core\CreateXhsSchemeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs">
      <SubType>UserControl</SubType>
@@ -106,10 +109,7 @@
    <Compile Update="03-simulation\04-scheme\01-add\AddXhsSchemeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\04-scheme\02-page\XhsProjectSimulationSchemePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\05-function\XhsProjectSimulationFunctionCtrl.cs">
    <Compile Update="03-simulation\05-function\SimulationFunctionCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingCtrl.cs">
@@ -298,6 +298,9 @@
    <Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\12-report\test.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\XhsProjectSimulationMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>