From 800f1652b2ed0473850975efe5028685bcd605c4 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 20 九月 2025 14:42:40 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ede0be8..21b43e1 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/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,29 @@
<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\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>
<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,8 +1912,14 @@
<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>
+ <EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhdPrint.resx">
+ <DependentUpon>UcRptCgdhdPrint.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\WomShjh.resx">
<DependentUpon>WomShjh.cs</DependentUpon>
@@ -2066,9 +2096,18 @@
<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\Frm_WwLlDjN.resx">
+ <DependentUpon>Frm_WwLlDjN.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>
--
Gitblit v1.9.3