修改冲突后问题

duheng

2024-11-29 9c1af7f5ec91917b4276b25406c86386fd337fbb

 WinFrmUI/PBS.WinFrmUI.WE.Core/WaterUtensil/01-group/UtensilGroupViewModel.cs

@@ -1,6 +1,6 @@
using 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;