From 1498516cb98d75e8f0dcbbfe232f2a0f1ff00c9b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 29 十月 2024 12:45:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index dca1c2c..e064fda 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -229,6 +229,31 @@
<Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs">
<DependentUpon>Frm_IQCLookups.cs</DependentUpon>
</Compile>
+ <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_MesQaItemsDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
+ <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+ </Compile>
+ <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 Include="DevFrm\QC\Frm_MesQaItemsDetect01.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs">
+ <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+
+ </Compile>
<Compile Include="DevFrm\QC\Frm_MesQmAql1.cs">
<SubType>Form</SubType>
</Compile>
@@ -247,6 +272,8 @@
<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" />
@@ -496,6 +523,14 @@
<EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
<DependentUpon>Frm_IQCLookups.cs</DependentUpon>
</EmbeddedResource>
+
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesQaMj.resx">
+ <DependentUpon>Frm_MesQaMj.cs</DependentUpon>
+
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx">
+ <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
+
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Frm_MesQmAql1.resx">
<DependentUpon>Frm_MesQmAql1.cs</DependentUpon>
</EmbeddedResource>
@@ -693,6 +728,14 @@
<None Include="Resources\checkbuttons_16x161.png" />
<None Include="Resources\boposition2_32x32.png" />
<None Include="Resources\boposition2_16x161.png" />
+ <None Include="Resources\ide_16x16.png" />
+ <None Include="Resources\spellcheck_16x16.png" />
+ <None Include="Resources\clearformatting_16x16.png" />
+ <None Include="Resources\sortandfilter_16x16.png" />
+ <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" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3