From da1667144a6160a2ea78e9c4b112272dea20cbec Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 09 八月 2025 17:55:54 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 407c988..0b5697d 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1032,6 +1032,12 @@
<Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\WOM\Frm_WomdaaNbz.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\Frm_WomdaaNbz.Designer.cs">
+ <DependentUpon>Frm_WomdaaNbz.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\WOM\Frm_WomFanGong.cs">
<SubType>Form</SubType>
</Compile>
@@ -1509,6 +1515,12 @@
<Compile Include="XtraForm1.Designer.cs">
<DependentUpon>XtraForm1.cs</DependentUpon>
</Compile>
+ <Compile Include="XtraForm2.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="XtraForm2.Designer.cs">
+ <DependentUpon>XtraForm2.cs</DependentUpon>
+ </Compile>
<EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
<DependentUpon>Frm_Customer.cs</DependentUpon>
</EmbeddedResource>
@@ -1895,6 +1907,9 @@
<EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\Frm_WomdaaNbz.resx">
+ <DependentUpon>Frm_WomdaaNbz.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\Frm_WomFanGong.resx">
<DependentUpon>Frm_WomFanGong.cs</DependentUpon>
</EmbeddedResource>
@@ -2129,6 +2144,9 @@
<EmbeddedResource Include="XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="XtraForm2.resx">
+ <DependentUpon>XtraForm2.cs</DependentUpon>
+ </EmbeddedResource>
<None Include="App.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
--
Gitblit v1.9.3