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

lu

3 天以前 e72209e7deabcea4545e374e2b9335566650aa74

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -806,6 +806,12 @@
    <Compile Include="DevFrm\Rpt\QLCX.Designer.cs">
      <DependentUpon>QLCX.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\RptQT.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\RptQT.Designer.cs">
      <DependentUpon>RptQT.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\UcRptCgdhd.cs">
      <SubType>UserControl</SubType>
    </Compile>
@@ -1179,11 +1185,23 @@
    <Compile Include="DevFrm\Work\Frm_WorkTechniqueShow.Designer.cs">
      <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WW\Frm_WwLl.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WW\Frm_WwLl.Designer.cs">
      <DependentUpon>Frm_WwLl.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WW\showWwZhongTai.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WW\showWwZhongTai.Designer.cs">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WW\UcWwBlclSelect.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WW\UcWwBlclSelect.Designer.cs">
      <DependentUpon>UcWwBlclSelect.cs</DependentUpon>
    </Compile>
    <Compile Include="Properties\Resources.Designer.cs">
      <AutoGen>True</AutoGen>
@@ -1888,6 +1906,9 @@
    <EmbeddedResource Include="DevFrm\Rpt\QLCX.resx">
      <DependentUpon>QLCX.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\RptQT.resx">
      <DependentUpon>RptQT.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhd.resx">
      <DependentUpon>UcRptCgdhd.cs</DependentUpon>
    </EmbeddedResource>
@@ -2066,9 +2087,15 @@
    <EmbeddedResource Include="DevFrm\Work\Frm_WorkTechniqueShow.resx">
      <DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WW\Frm_WwLl.resx">
      <DependentUpon>Frm_WwLl.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WW\UcWwBlclSelect.resx">
      <DependentUpon>UcWwBlclSelect.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\CopyXls.resx">
      <DependentUpon>CopyXls.cs</DependentUpon>
    </EmbeddedResource>