From 101f98e3ea731465690b5a4f395483d3552b5995 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 04 九月 2025 09:24:45 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 9361f9f..2da2b2e 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -509,6 +509,12 @@
<Compile Include="DevFrm\PDA\SelectItem.Designer.cs">
<DependentUpon>SelectItem.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\PDA\SelectKW.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\PDA\SelectKW.Designer.cs">
+ <DependentUpon>SelectKW.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\PDA\SelectLine.cs">
<SubType>Form</SubType>
</Compile>
@@ -847,6 +853,12 @@
</Compile>
<Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.Designer.cs">
<DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.Designer.cs">
+ <DependentUpon>Frm_SalesReturnNoticeSelect2.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.cs">
<SubType>Form</SubType>
@@ -1738,6 +1750,9 @@
<EmbeddedResource Include="DevFrm\PDA\SelectItem.resx">
<DependentUpon>SelectItem.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\PDA\SelectKW.resx">
+ <DependentUpon>SelectKW.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\SelectLine.resx">
<DependentUpon>SelectLine.cs</DependentUpon>
</EmbeddedResource>
@@ -1879,6 +1894,12 @@
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.resx">
<DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect2.resx">
+ <DependentUpon>Frm_SalesReturnNoticeSelect2.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.resx">
+ <DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
<DependentUpon>EasyRptEdt.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3