Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-05 8dfc8d054b5b14e3fcde6415dd22cedf10c09915

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -265,10 +265,10 @@
    <Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs">
      <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmAql3.cs" />
@@ -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>
@@ -663,6 +678,9 @@
    </EmbeddedResource>
    <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>
@@ -772,9 +790,6 @@
    <None Include="Resources\spellcheck_16x16.png" />
    <None Include="Resources\clearformatting_16x16.png" />
    <None Include="Resources\sortandfilter_16x16.png" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
    <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
    <None Include="Resources\deletetablecells_32x32.png" />
    <None Include="Resources\deletetablecells_16x16.png" />
    <None Include="Resources\checkbox2_32x322.png" />
@@ -801,6 +816,11 @@
    <None Include="Resources\fill_16x16.png" />
    <None Include="Resources\bouser_16x162.png" />
    <None Include="Resources\refresh_32x32.png" />
    <None Include="Resources\refresh_32x321.png" />
    <None Include="Resources\trackingchanges_previous_32x32.png" />
    <None Include="Resources\trackingchanges_previous_16x16.png" />
    <None Include="Resources\updatetableofcontents_32x32.png" />
    <None Include="Resources\updatetableofcontents_16x16.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />