Merge remote-tracking branch 'origin/master'

啊鑫

2024-11-02 cf8c3cb608bceb47bc4ea83fb7a9bfe22cb80d2e

 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 />