From 3dc0ce85e56e3b3d13ec6ab99409ea8e3c0d9078 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 18 九月 2025 16:16:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 7bb7009..22bd9d8 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -806,11 +806,23 @@
<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>
<Compile Include="DevFrm\Rpt\UcRptCgdhd.Designer.cs">
<DependentUpon>UcRptCgdhd.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptCgdhdPrint.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptCgdhdPrint.Designer.cs">
+ <DependentUpon>UcRptCgdhdPrint.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Rpt\WomShjh.cs">
<SubType>Form</SubType>
@@ -1173,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>
@@ -1882,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>
@@ -2060,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>
--
Gitblit v1.9.3