Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2024-10-12 f2333318a31e92f6cbc3a572d8eb9fae9da0f892

 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs

@@ -6,7 +6,7 @@
        {
        }

        public CurrentPartMainViewModel(Vmo.PumpPartMainVmo rhs) : base()
        public CurrentPartMainViewModel(Vmo.AssetsPumpPartMainVmo rhs) : base()
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -15,7 +15,7 @@
            this.SeriesID = rhs.SeriesID;
        }

        public void Reset(Vmo.PumpPartMainVmo rhs)
        public void Reset(Vmo.AssetsPumpPartMainVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;