From 9c1af7f5ec91917b4276b25406c86386fd337fbb Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 29 十一月 2024 16:35:44 +0800
Subject: [PATCH] 修改冲突后问题
---
WinFrmUI/PBS.WinFrmUI.WE.Core/WaterUtensil/01-group/UtensilGroupViewModel.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.WE.Core/WaterUtensil/01-group/UtensilGroupViewModel.cs b/WinFrmUI/PBS.WinFrmUI.WE.Core/WaterUtensil/01-group/UtensilGroupViewModel.cs
index d186e17..652fdcc 100644
--- a/WinFrmUI/PBS.WinFrmUI.WE.Core/WaterUtensil/01-group/UtensilGroupViewModel.cs
+++ b/WinFrmUI/PBS.WinFrmUI.WE.Core/WaterUtensil/01-group/UtensilGroupViewModel.cs
@@ -1,6 +1,6 @@
锘縰sing Yw.Untity;
-namespace HStation.WinFrmUI.WE
+namespace PBS.WinFrmUI.WE
{
public class UtensilGroupViewModel
{
@@ -8,7 +8,7 @@
{
}
- public UtensilGroupViewModel(Vmo.WE.UtensilGroupVmo rhs)
+ public UtensilGroupViewModel(PBS.Vmo.WE.UtensilGroupVmo rhs)
{
this.Name = rhs.Name;
this.ID = rhs.ID;
@@ -16,7 +16,7 @@
this.Description = rhs.Description;
}
- public void Reset(Vmo.WE.UtensilGroupVmo rhs)
+ public void Reset(PBS.Vmo.WE.UtensilGroupVmo rhs)
{
this.Name = rhs.Name;
this.ID = rhs.ID;
--
Gitblit v1.9.3