Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-22 a985c4d4b80fbf3eb4abbe385adcd0536fd29eda

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -486,6 +486,12 @@
    <Compile Include="UserControl\SelectCgMx.Designer.cs">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCgOutMx.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectCgOutMx.Designer.cs">
      <DependentUpon>SelectCgOutMx.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCheckDt.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -712,6 +718,9 @@
    <EmbeddedResource Include="UserControl\SelectCgMx.resx">
      <DependentUpon>SelectCgMx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCgOutMx.resx">
      <DependentUpon>SelectCgOutMx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCheckDt.resx">
      <DependentUpon>SelectCheckDt.cs</DependentUpon>
    </EmbeddedResource>