接口冲突

Shuxia Ning

2024-11-09 d2f89d47afad3f3fe2f4266658b25f5baa101ea3

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

@@ -44,6 +44,11 @@
    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.Designer.cs" />
    <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 复制.cs" />
    <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 复制.Designer.cs" />
    <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemePipeViewModel.cs" />
    <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemePumpViewModel.cs" />
    <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemeValveViewModel.cs" />
    <Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 复制.cs" />
    <Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 复制.Designer.cs" />
    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制%282%29.cs" />
    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制%282%29.Designer.cs" />
    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制%283%29.cs" />
@@ -67,6 +72,7 @@
  <ItemGroup>
    <EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.resx" />
    <EmbeddedResource Remove="02-project\03-mgr\XhsProjectMgrPage - 复制.resx" />
    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 复制.resx" />
    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制%282%29.resx" />
    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制%283%29.resx" />
    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 复制%284%29.resx" />