Merge remote-tracking branch 'origin/master'

啊鑫

2024-10-29 1498516cb98d75e8f0dcbbfe232f2a0f1ff00c9b

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -235,6 +235,25 @@
    <Compile Include="DevFrm\QC\Frm_MesQaMj.Designer.cs">
      <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
      <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesQaMj.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesQaMj.Designer.cs">
      <DependentUpon>Frm_MesQaMj.cs</DependentUpon>

    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
      <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>

    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesQmAql1.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -254,6 +273,10 @@
      <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\MesQmAql1.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmAql3.cs" />
@@ -500,8 +523,13 @@
    <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
      <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
    </EmbeddedResource>

    <EmbeddedResource Include="DevFrm\QC\Frm_MesQaMj.resx">
      <DependentUpon>Frm_MesQaMj.cs</DependentUpon>

    <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx">
      <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>

    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\Frm_MesQmAql1.resx">
      <DependentUpon>Frm_MesQmAql1.cs</DependentUpon>
@@ -700,6 +728,14 @@
    <None Include="Resources\checkbuttons_16x161.png" />
    <None Include="Resources\boposition2_32x32.png" />
    <None Include="Resources\boposition2_16x161.png" />
    <None Include="Resources\ide_16x16.png" />
    <None Include="Resources\spellcheck_16x16.png" />
    <None Include="Resources\clearformatting_16x16.png" />
    <None Include="Resources\sortandfilter_16x16.png" />
    <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" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />