冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AssetsSprinklerMainMgrViewModel.cs

@@ -21,7 +21,6 @@
            this.ID = rhs.ID;
            this.SeriesID = rhs.SeriesID;
            this.Name = rhs.Name;
            this.MinorLoss = rhs.MinorLoss;
            this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
            this.TagName = rhs.TagName;
@@ -42,7 +41,6 @@
            this.ID = rhs.ID;
            this.SeriesID = rhs.SeriesID;
            this.Name = rhs.Name;
            this.MinorLoss = rhs.MinorLoss;
            this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
            this.TagName = rhs.TagName;
@@ -67,15 +65,15 @@
        public long SeriesID { get; set; }

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

        /// <summary>
        /// 口径
        /// </summary>
        [Display(Name = "口径")]
        [Display(Name = "口径(mm)")]
        public double? Caliber { 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>
        /// 角度
@@ -100,7 +92,7 @@
        /// 流量系数
        /// </summary>
        [Display(Name = "流量系数")]
        public double? FlowMinorLoss { get; set; }
        public double FlowMinorLoss { get; set; }

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