冲突

duheng

2024-11-21 c653f2f6f2de553395b706de3a62fec5e4a6fbf7

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

@@ -37,10 +37,22 @@
    <Compile Update="11-search\InputHydroVisualSearchListDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="12-monitor\01-set\SetHydroVisualMonitorCtrl.cs">
    <Compile Update="12-monitor\01-set\SetHydroMonitorListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="12-monitor\02-value\HydroVisualMonitorValueListCtrl.cs">
    <Compile Update="12-monitor\02-value\HydroMonitorValueListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="16-evaluation\HydroWorkingEvaluationCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="16-evaluation\HydroWorkingItemEvaluationCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="16-evaluation\HydroWorkingMonitorEvaluationListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="16-evaluation\HydroWorkingTotalEvaluationCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="99-view\01-q3d\HydroQ3dViewPage.cs">