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

cdk

5 天以前 33583f8a9716e4313163fb9bbde58fea02012a28

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -509,6 +509,12 @@
    <Compile Include="DevFrm\PDA\SelectItem.Designer.cs">
      <DependentUpon>SelectItem.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectKW.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectKW.Designer.cs">
      <DependentUpon>SelectKW.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\PDA\SelectLine.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -757,6 +763,12 @@
    </Compile>
    <Compile Include="DevFrm\Rpt\Ckcgmx.Designer.cs">
      <DependentUpon>Ckcgmx.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\CkKuCun.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\CkKuCun.Designer.cs">
      <DependentUpon>CkKuCun.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\CKTmkc.cs">
      <SubType>Form</SubType>
@@ -1744,6 +1756,9 @@
    <EmbeddedResource Include="DevFrm\PDA\SelectItem.resx">
      <DependentUpon>SelectItem.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\PDA\SelectKW.resx">
      <DependentUpon>SelectKW.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\PDA\SelectLine.resx">
      <DependentUpon>SelectLine.cs</DependentUpon>
    </EmbeddedResource>
@@ -1840,6 +1855,9 @@
    <EmbeddedResource Include="DevFrm\Rpt\Ckcgmx.resx">
      <DependentUpon>Ckcgmx.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\CkKuCun.resx">
      <DependentUpon>CkKuCun.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx">
      <DependentUpon>CKTmkc.cs</DependentUpon>
    </EmbeddedResource>