冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

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

@@ -21,7 +21,8 @@
            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);
            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
            this.TagName = rhs.TagName;
@@ -40,7 +41,8 @@
            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);
            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
            this.TagName = rhs.TagName;
@@ -63,9 +65,9 @@
        public long SeriesID { get; set; }

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

        /// <summary>
@@ -81,10 +83,16 @@
        public string Material { get; set; }

        /// <summary>
        /// 喷射系数
        /// 主管通过损失系数
        /// </summary>
        [Display(Name = "喷射系数")]
        public double MinorLoss { get; set; }
        [Display(Name = "主管通过损失系数")]
        public double? RunThroughMinorLoss { get; set; }

        /// <summary>
        /// 支管通过损失系数
        /// </summary>
        [Display(Name = "支管通过损失系数")]
        public double? BranchThroughMinorLoss { get; set; }

        /// <summary>
        /// 关键字