Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

3 天以前 ae28c33700e413d5acf60d1e48bbc9870bdef5a5

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -683,11 +683,11 @@
    <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.Designer.cs">
      <DependentUpon>Frm_QtrkDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.cs">
    <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
      <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
    <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.Designer.cs">
      <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.cs">
      <SubType>Form</SubType>
@@ -1738,8 +1738,8 @@
    <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqsq.resx">
      <DependentUpon>Frm_Cqsq.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_SctlDetect01.resx">
      <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_ShouTuoDetect01.resx">
      <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
      <DependentUpon>RkDetect01.cs</DependentUpon>