冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AssetsThreelinkMainMgrViewModel.cs

@@ -21,7 +21,6 @@
            this.ID = rhs.ID;
            this.SeriesID = rhs.SeriesID;
            this.Name = rhs.Name;
            this.MinorLoss = rhs.MinorLoss;
            this.RunThroughMinorLoss = rhs.RunThroughMinorLoss;
            this.BranchThroughMinorLoss = rhs.BranchThroughMinorLoss;
            this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
@@ -42,7 +41,6 @@
            this.ID = rhs.ID;
            this.SeriesID = rhs.SeriesID;
            this.Name = rhs.Name;
            this.MinorLoss = rhs.MinorLoss;
            this.RunThroughMinorLoss = rhs.RunThroughMinorLoss;
            this.BranchThroughMinorLoss = rhs.BranchThroughMinorLoss;
            this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
@@ -67,9 +65,9 @@
        public long SeriesID { get; set; }

        /// <summary>
        /// 名称
        /// 型号
        /// </summary>
        [Display(Name = "名称")]
        [Display(Name = "型号")]
        public string Name { get; set; }

        /// <summary>
@@ -83,12 +81,6 @@
        /// </summary>
        [Display(Name = "材料")]
        public string Material { get; set; }

        /// <summary>
        /// 喷射系数
        /// </summary>
        [Display(Name = "喷射系数")]
        public double MinorLoss { get; set; }

        /// <summary>
        /// 主管通过损失系数