From 74202f2545445ed080b3bd2536474b9661990378 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 29 十月 2024 14:28:11 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 30a7fe7..185da0a 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -229,11 +229,17 @@
<Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs">
<DependentUpon>Frm_IQCLookups.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
+ <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
- <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+ <Compile Include="DevFrm\QC\Frm_MesQaMj.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQaMj.Designer.cs">
+ <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\QC\Frm_MesQmAql1.cs">
<SubType>Form</SubType>
@@ -253,6 +259,7 @@
<Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs">
<DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
<Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
<Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
<Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
@@ -505,6 +512,9 @@
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx">
<DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesQaMj.resx">
+ <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Frm_MesQmAql1.resx">
<DependentUpon>Frm_MesQmAql1.cs</DependentUpon>
</EmbeddedResource>
@@ -706,6 +716,9 @@
<None Include="Resources\spellcheck_16x16.png" />
<None Include="Resources\clearformatting_16x16.png" />
<None Include="Resources\sortandfilter_16x16.png" />
+ <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" />
+ <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3