From 2d10d3921343a8cfe2c1dc752d3aa3c31a7335c4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 05 十一月 2024 08:59:43 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 7efb2ee..20828cc 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -265,10 +265,10 @@
<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" />
+ <Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql3.cs" />
@@ -336,6 +336,12 @@
</Compile>
<Compile Include="DevFrm\Sys\SysMenu.Designer.cs">
<DependentUpon>SysMenu.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\User\RoleSelectAction.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\User\RoleSelectAction.Designer.cs">
+ <DependentUpon>RoleSelectAction.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\User\User.cs">
<SubType>Form</SubType>
@@ -495,6 +501,12 @@
<Compile Include="UserControl\UcToolBarMenu.Designer.cs">
<DependentUpon>UcToolBarMenu.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UCUpFile.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UCUpFile.Designer.cs">
+ <DependentUpon>UCUpFile.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\XtraUserControl1.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -583,6 +595,9 @@
<EmbeddedResource Include="DevFrm\Sys\SysMenu.resx">
<DependentUpon>SysMenu.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\User\RoleSelectAction.resx">
+ <DependentUpon>RoleSelectAction.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\User\User.resx">
<DependentUpon>User.cs</DependentUpon>
</EmbeddedResource>
@@ -654,6 +669,9 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcToolBarMenu.resx">
<DependentUpon>UcToolBarMenu.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UCUpFile.resx">
+ <DependentUpon>UCUpFile.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\XtraUserControl1.resx">
<DependentUpon>XtraUserControl1.cs</DependentUpon>
@@ -763,9 +781,6 @@
<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" />
<None Include="Resources\deletetablecells_32x32.png" />
<None Include="Resources\deletetablecells_16x16.png" />
<None Include="Resources\checkbox2_32x322.png" />
@@ -790,6 +805,13 @@
<None Include="Resources\sendxls_16x16.png" />
<None Include="Resources\fill_32x32.png" />
<None Include="Resources\fill_16x16.png" />
+ <None Include="Resources\bouser_16x162.png" />
+ <None Include="Resources\refresh_32x32.png" />
+ <None Include="Resources\refresh_32x321.png" />
+ <None Include="Resources\trackingchanges_previous_32x32.png" />
+ <None Include="Resources\trackingchanges_previous_16x16.png" />
+ <None Include="Resources\updatetableofcontents_32x32.png" />
+ <None Include="Resources\updatetableofcontents_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3