Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LW_MesClient

cnf

昨天 86e875b896d74dce8757ad693eb5dd336a7645cf

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -346,6 +346,12 @@
    <Compile Include="DevFrm\FQC\Frm_FqcDetect01.Designer.cs">
      <DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\FQC\Frm_FQCItem.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\FQC\Frm_FQCItem.Designer.cs">
      <DependentUpon>Frm_FQCItem.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\FQC\MesFqcExceptional.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1027,11 +1033,23 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>Resources.resx</DependentUpon>
    </Compile>
    <Compile Include="UserControl\CopyXls.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\CopyXls.Designer.cs">
      <DependentUpon>CopyXls.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectCk.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectCk.Designer.cs">
      <DependentUpon>SelectCk.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectDaa.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="UserControl\SelectDaa.Designer.cs">
      <DependentUpon>SelectDaa.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectDeleteBar.cs">
      <SubType>Form</SubType>
@@ -1499,6 +1517,9 @@
    <EmbeddedResource Include="DevFrm\FQC\Frm_FqcDetect01.resx">
      <DependentUpon>Frm_FqcDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\FQC\Frm_FQCItem.resx">
      <DependentUpon>Frm_FQCItem.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\FQC\MesFqcExceptional.resx">
      <DependentUpon>MesFqcExceptional.cs</DependentUpon>
    </EmbeddedResource>
@@ -1810,9 +1831,15 @@
    <EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\CopyXls.resx">
      <DependentUpon>CopyXls.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectCk.resx">
      <DependentUpon>SelectCk.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectDaa.resx">
      <DependentUpon>SelectDaa.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectDeleteBar.resx">
      <DependentUpon>SelectDeleteBar.cs</DependentUpon>
    </EmbeddedResource>