From 730ae1a961047b097fc3167b3418e899e0be2507 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 09 十一月 2024 18:08:00 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 51dbbde..2c5f719 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -437,12 +437,6 @@
<Compile Include="TestForm\XtraForm2.Designer.cs">
<DependentUpon>XtraForm2.cs</DependentUpon>
</Compile>
- <Compile Include="TestForm\XtraForm3.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="TestForm\XtraForm3.Designer.cs">
- <DependentUpon>XtraForm3.cs</DependentUpon>
- </Compile>
<Compile Include="ToolBox\LogHelper.cs" />
<Compile Include="ToolBox\MsgHelper.cs" />
<Compile Include="ToolBox\UpdateParentEventArgs.cs" />
@@ -458,6 +452,12 @@
</Compile>
<Compile Include="UserControl\SelectCheckDt.Designer.cs">
<DependentUpon>SelectCheckDt.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\ShowFile.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\ShowFile.Designer.cs">
+ <DependentUpon>ShowFile.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\ShowLogcs.cs">
<SubType>Form</SubType>
@@ -658,14 +658,14 @@
<EmbeddedResource Include="TestForm\XtraForm2.resx">
<DependentUpon>XtraForm2.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="TestForm\XtraForm3.resx">
- <DependentUpon>XtraForm3.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCgMx.resx">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCheckDt.resx">
<DependentUpon>SelectCheckDt.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\ShowFile.resx">
+ <DependentUpon>ShowFile.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\ShowLogcs.resx">
<DependentUpon>ShowLogcs.cs</DependentUpon>
@@ -843,6 +843,7 @@
<None Include="Resources\updatetableofcontents_32x32.png" />
<None Include="Resources\updatetableofcontents_16x16.png" />
<None Include="Resources\close_16x16.png" />
+ <None Include="Resources\print_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3