From cf8c3cb608bceb47bc4ea83fb7a9bfe22cb80d2e Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 02 十一月 2024 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 7efb2ee..4ae2332 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -337,6 +337,12 @@
<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>
</Compile>
@@ -583,6 +589,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>
@@ -790,6 +799,8 @@
<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" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
--
Gitblit v1.9.3