From cabb7ecdde336baec10b5ca4e0bd09d443b2023b Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期二, 23 十二月 2025 13:28:57 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 9a1e57c..cb92c88 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -593,7 +593,9 @@
<Compile Include="DevFrm\QC\DefectCodeQc.Designer.cs">
<DependentUpon>DefectCodeQc.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\QC\DefectCodeQtck.cs" />
+ <Compile Include="DevFrm\QC\DefectCodeQtck.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Include="DevFrm\QC\DefectCodeQtck.Designer.cs">
<DependentUpon>DefectCodeQtck.cs</DependentUpon>
</Compile>
@@ -985,6 +987,12 @@
<Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.Designer.cs">
<DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Sys\DefectCodeKanban.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\DefectCodeKanban.Designer.cs">
+ <DependentUpon>DefectCodeKanban.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Sys\EasyRptEdt.cs">
<SubType>Form</SubType>
</Compile>
@@ -1002,6 +1010,18 @@
</Compile>
<Compile Include="DevFrm\Sys\Frm_Config.Designer.cs">
<DependentUpon>Frm_Config.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sys\SimpleKanBan.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\SimpleKanBan.Designer.cs">
+ <DependentUpon>SimpleKanBan.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sys\SimpleKanBanEdit.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\SimpleKanBanEdit.Designer.cs">
+ <DependentUpon>SimpleKanBanEdit.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\User\ViewRole.cs">
<SubType>Form</SubType>
@@ -1261,6 +1281,12 @@
</Compile>
<Compile Include="DevFrm\Work\Frm_Work01.Designer.cs">
<DependentUpon>Frm_Work01.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Work\Frm_Work01Fg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Work\Frm_Work01Fg.Designer.cs">
+ <DependentUpon>Frm_Work01Fg.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Work\Frm_WorkProcesses.cs">
<SubType>Form</SubType>
@@ -2121,6 +2147,9 @@
<EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.resx">
<DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\DefectCodeKanban.resx">
+ <DependentUpon>DefectCodeKanban.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
<DependentUpon>EasyRptEdt.cs</DependentUpon>
</EmbeddedResource>
@@ -2129,6 +2158,12 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\Frm_Config.resx">
<DependentUpon>Frm_Config.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\SimpleKanBan.resx">
+ <DependentUpon>SimpleKanBan.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\SimpleKanBanEdit.resx">
+ <DependentUpon>SimpleKanBanEdit.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\User\ViewRole.resx">
<DependentUpon>ViewRole.cs</DependentUpon>
@@ -2254,6 +2289,9 @@
<EmbeddedResource Include="DevFrm\Work\Frm_Work01.resx">
<DependentUpon>Frm_Work01.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Work\Frm_Work01Fg.resx">
+ <DependentUpon>Frm_Work01Fg.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Work\Frm_WorkProcesses.resx">
<DependentUpon>Frm_WorkProcesses.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3