冲突（变速曲线）

Shuxia Ning

2024-10-14 02cde90c53b4a80252be2944f6d53a368b7252ba

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

@@ -64,7 +64,10 @@
    <Compile Update="03-simulation\05-function\XhsProjectSimulationFunctionMgrCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\03-calcu\01-failed\XhsProjectSimulationHydroCalcuFailedCtrl.cs">
    <Compile Update="03-simulation\06-simulation\03-calcu\00-core\XhsProjectSimulationCalcuCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\03-calcu\01-failed\XhsProjectSimulationCalcuFailedCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\03-calcu\02-prefix\00-core\XhsProjectSimulationCalcuPrefixCtrl.cs">
@@ -85,6 +88,9 @@
    <Compile Update="03-simulation\06-simulation\05-search\XhsProjectSimulationSearchCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\07-bulkset\01-pump\XhsProjectSimulationPumpBulkSetCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\XhsProjectSimulationMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>