Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-05 8dfc8d054b5b14e3fcde6415dd22cedf10c09915

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -419,6 +419,12 @@
    <Compile Include="TestForm\XtraForm1.Designer.cs">
      <DependentUpon>XtraForm1.cs</DependentUpon>
    </Compile>
    <Compile Include="TestForm\XtraForm2.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="TestForm\XtraForm2.Designer.cs">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </Compile>
    <Compile Include="ToolBox\LogHelper.cs" />
    <Compile Include="ToolBox\MsgHelper.cs" />
    <Compile Include="ToolBox\UpdateParentEventArgs.cs" />
@@ -500,6 +506,12 @@
    </Compile>
    <Compile Include="UserControl\UcToolBarMenu.Designer.cs">
      <DependentUpon>UcToolBarMenu.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UCUpFile.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="UserControl\UCUpFile.Designer.cs">
      <DependentUpon>UCUpFile.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\XtraUserControl1.cs">
      <SubType>UserControl</SubType>
@@ -625,6 +637,9 @@
    <EmbeddedResource Include="TestForm\XtraForm1.resx">
      <DependentUpon>XtraForm1.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="TestForm\XtraForm2.resx">
      <DependentUpon>XtraForm2.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCgMx.resx">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </EmbeddedResource>
@@ -664,6 +679,9 @@
    <EmbeddedResource Include="UserControl\UcToolBarMenu.resx">
      <DependentUpon>UcToolBarMenu.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UCUpFile.resx">
      <DependentUpon>UCUpFile.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\XtraUserControl1.resx">
      <DependentUpon>XtraUserControl1.cs</DependentUpon>
    </EmbeddedResource>