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

lu

3 天以前 63384af5165b189bfb8c682559e7c7a08d483f0b

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -410,6 +410,54 @@
    <Compile Include="DevFrm\IPQC\Frm_XunJianDetect01.Designer.cs">
      <DependentUpon>Frm_XunJianDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MesAttanCon.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MesAttanCon.Designer.cs">
      <DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.Designer.cs">
      <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MesJJSalary.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MesJJSalary.Designer.cs">
      <DependentUpon>Frm_MesJJSalary.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MesJSSalary.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MesJSSalary.Designer.cs">
      <DependentUpon>Frm_MesJSSalary.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MesTimeType.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\JJGZ\Frm_MesTimeType.Designer.cs">
      <DependentUpon>Frm_MesTimeType.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\JJGZ\KQCX.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\JJGZ\KQCX.Designer.cs">
      <DependentUpon>KQCX.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\JJGZ\SelectSTAFF.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\JJGZ\SelectSTAFF.Designer.cs">
      <DependentUpon>SelectSTAFF.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\JJGZ\SetLB.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\JJGZ\SetLB.Designer.cs">
      <DependentUpon>SetLB.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\PDA\Frm_AreaBind.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1564,6 +1612,30 @@
    <EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01Show.resx">
      <DependentUpon>Frm_XunJianDetect01Show.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesAttanCon.resx">
      <DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MESJJERRORJS.resx">
      <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJJSalary.resx">
      <DependentUpon>Frm_MesJJSalary.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJSSalary.resx">
      <DependentUpon>Frm_MesJSSalary.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesTimeType.resx">
      <DependentUpon>Frm_MesTimeType.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\JJGZ\KQCX.resx">
      <DependentUpon>KQCX.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\JJGZ\SelectSTAFF.resx">
      <DependentUpon>SelectSTAFF.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\JJGZ\SetLB.resx">
      <DependentUpon>SetLB.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\PDA\Frm_AreaBind.resx">
      <DependentUpon>Frm_AreaBind.cs</DependentUpon>
    </EmbeddedResource>