From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserRoleHaveViewModel.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserRoleHaveViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserRoleHaveViewModel.cs
index c984bc4..04a7cf9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserRoleHaveViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserRoleHaveViewModel.cs
@@ -8,7 +8,7 @@
public UserRoleHaveViewModel()
{ }
- public UserRoleHaveViewModel(Yw.Vmo.UserRoleHave rhs)
+ public UserRoleHaveViewModel(Yw.Vmo.UserRoleHaveVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
--
Gitblit v1.9.3