From 2ffa3cda080d1990775fe42e13ced433d27ca3e8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 10 十二月 2024 10:36:37 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 6007c0c..88ae893 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -162,6 +162,7 @@
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
+ <Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
@@ -355,6 +356,20 @@
<Compile Include="DevFrm\Sys\Frm_MesSysPageview.Designer.cs">
<DependentUpon>Frm_MesSysPageview.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Sys\Frm_PrintInfo.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\Frm_PrintInfo.Designer.cs">
+ <DependentUpon>Frm_PrintInfo.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sys\Frm_PrintUser.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sys\Frm_PrintUser.Designer.cs">
+ <DependentUpon>Frm_PrintUser.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Sys\Mode\PrintInfo.cs" />
+ <Compile Include="DevFrm\Sys\Mode\PrintUser.cs" />
<Compile Include="DevFrm\Sys\SysHelp.cs">
<SubType>Form</SubType>
</Compile>
@@ -606,6 +621,12 @@
<Compile Include="UserControl\UcLookOrg.Designer.cs">
<DependentUpon>UcLookOrg.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UcLookPrint.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookPrint.Designer.cs">
+ <DependentUpon>UcLookPrint.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcLookStaff.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -623,6 +644,12 @@
</Compile>
<Compile Include="UserControl\UcLookUnit.Designer.cs">
<DependentUpon>UcLookUnit.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcLookUser.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookUser.Designer.cs">
+ <DependentUpon>UcLookUser.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcLookWorkline.cs">
<SubType>UserControl</SubType>
@@ -745,6 +772,12 @@
<EmbeddedResource Include="DevFrm\Sys\Frm_MesSysPageview.resx">
<DependentUpon>Frm_MesSysPageview.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\Frm_PrintInfo.resx">
+ <DependentUpon>Frm_PrintInfo.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Sys\Frm_PrintUser.resx">
+ <DependentUpon>Frm_PrintUser.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Sys\SysHelp.resx">
<DependentUpon>SysHelp.cs</DependentUpon>
</EmbeddedResource>
@@ -862,6 +895,9 @@
<EmbeddedResource Include="UserControl\UcLookOrg.resx">
<DependentUpon>UcLookOrg.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookPrint.resx">
+ <DependentUpon>UcLookPrint.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookStaff.resx">
<DependentUpon>UcLookStaff.cs</DependentUpon>
</EmbeddedResource>
@@ -870,6 +906,9 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookUnit.resx">
<DependentUpon>UcLookUnit.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookUser.resx">
+ <DependentUpon>UcLookUser.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookWorkline.resx">
<DependentUpon>UcLookWorkline.cs</DependentUpon>
@@ -1058,6 +1097,8 @@
<None Include="Resources\renamedatasource_16x161.png" />
<None Include="Resources\deletelist2_16x16.png" />
<None Include="Resources\reset_16x16.png" />
+ <None Include="Resources\exportfile_16x161.png" />
+ <None Include="Resources\cleartablestyle_16x161.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3