冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/03-coefficient/ThreelinkCoefficientViewModel.cs

@@ -7,7 +7,7 @@
        public ThreelinkCoefficientViewModel()
        { }

        public ThreelinkCoefficientViewModel(Vmo.AssetsThreelinkCoefficientVmo rhs)
        public ThreelinkCoefficientViewModel(Vmo.AssetsThreelinkFactorVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -59,7 +59,7 @@
        /// <summary>
        /// 支管通过损失系数
        /// </summary>
        [DisplayName("运行通过损失系数")]
        [DisplayName("支管通过损失系数")]
        [Browsable(true)]
        public double? BranchThroughMinorLoss { get; set; }
    }