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

lixiaojun

2024-10-18 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915

 WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/FourLinkViewModel.cs

@@ -8,7 +8,7 @@
        {
        }

        public FourLinkViewModel(Vmo.FourLinkMainVmo rhs)
        public FourLinkViewModel(Vmo.AssetsFourlinkMainVmo rhs)
        {
            this.ID = rhs.ID;
            this.Description = rhs.Description;
@@ -35,7 +35,7 @@
            this.Coefficient = rhs.Coefficient;
        }

        public void Reset(Vmo.FourLinkMainVmo rhs)
        public void Reset(Vmo.AssetsFourlinkMainVmo rhs)
        {
            this.ID = rhs.ID;
            if (rhs.Caliber == null)