冲突

duheng

2024-08-14 71ff3ccde064c104db61fa28300b039456c0ba06

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

@@ -83,10 +83,10 @@
    <Compile Update="03-scheme\04-scheme-mgr\02-comparison\XhsSchemeComparisonPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\XhsSchemeMultiMgrPageUpdate.cs">
    <Compile Update="03-scheme\XhsSchemeMultiMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\XhsSchemeMultiMgrPage.cs">
    <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak2.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="03-scheme\XhsSchemeMultiMgrPage_Bak.cs">