解决冲突

lixiaojun

2025-01-03 4766e0de56a2baa3edf7c48ed93333b6c452ce1b

解决冲突

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

@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Compile Update="01-home\00-core\HomeXhsProjectPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-home\01-project\HomeXhsProjectTreeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
@@ -49,15 +46,6 @@
    <Compile Update="02-project\01-import\04-completed\05-revit\XhsProjectResultRevitCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\02-bimface\XhsProjectBimfaceViewPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\03-mgr\XhsProjectMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\04-q3d\XhsProjectQ3dViewPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-project\05-add\AddXhsProjectDlg.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -74,9 +62,6 @@
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs">
@@ -119,9 +104,6 @@
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-simulation\05-function\SimulationFunctionCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-simulation\07-matching\02-pump\01-pumpsinglematching\PumpSingleMatchingCtrl.cs">
@@ -270,12 +252,6 @@
    </Compile>
    <Compile Update="03-simulation\12-report\02-helper\SimulationWorkingReportDlg.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>
    <Compile Update="04-pump\01-Prop\PumpPropViewCtrl.cs">
      <SubType>UserControl</SubType>