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

lu

3 天以前 800f1652b2ed0473850975efe5028685bcd605c4

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

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -1191,6 +1191,12 @@
    <Compile Include="DevFrm\WW\Frm_WwLl.Designer.cs">
      <DependentUpon>Frm_WwLl.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WW\Frm_WwLlDjN.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\WW\Frm_WwLlDjN.Designer.cs">
      <DependentUpon>Frm_WwLlDjN.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\WW\showWwZhongTai.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -2093,6 +2099,9 @@
    <EmbeddedResource Include="DevFrm\WW\Frm_WwLl.resx">
      <DependentUpon>Frm_WwLl.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WW\Frm_WwLlDjN.resx">
      <DependentUpon>Frm_WwLlDjN.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
      <DependentUpon>showWwZhongTai.cs</DependentUpon>
    </EmbeddedResource>