From ad8f523428e7f319700c226707e3cdfe389d6539 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 17 二月 2025 17:48:39 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj
index 3eef45c..4d4284b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj
@@ -37,7 +37,7 @@
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="Microsoft.QualityTools.Testing.Fakes" Version="17.5.0-beta.23060.1" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
- <PackageReference Include="Yw.BLL.Auth.Core" Version="3.6.3" />
+ <PackageReference Include="Yw.BLL.Auth.Core" Version="3.7.2" />
</ItemGroup>
<ItemGroup>
@@ -50,12 +50,17 @@
</ItemGroup>
<ItemGroup>
+ <Compile Remove="06-user-info\Window1.xaml.cs" />
<Compile Remove="RoleMainPanel.cs" />
<Compile Remove="RoleMainPanel.Designer.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="RoleMainPanel.resx" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Page Remove="06-user-info\Window1.xaml" />
</ItemGroup>
<ItemGroup>
@@ -95,6 +100,9 @@
<Compile Update="04-role-projcet-menu\RoleTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="06-user-info\AddPhoneNumberDlg.cs">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
--
Gitblit v1.9.3