冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AssetsTranslationMainMgrViewModel.cs

@@ -25,8 +25,7 @@
            this.Diameter = rhs.Diameter;
            this.StartDiameter = rhs.StartDiameter;
            this.EndDiameter = rhs.EndDiameter;
            this.Roughness = rhs.Roughness;
            this.eAlgorithmType = rhs.eAlgorithmType;
            this.TranslationType = rhs.TranslationType;
            this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
            this.TagName = rhs.TagName;
@@ -48,8 +47,7 @@
            this.Diameter = rhs.Diameter;
            this.StartDiameter = rhs.StartDiameter;
            this.EndDiameter = rhs.EndDiameter;
            this.Roughness = rhs.Roughness;
            this.eAlgorithmType = rhs.eAlgorithmType;
            this.TranslationType = rhs.TranslationType;
            this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
            this.TagName = rhs.TagName;
@@ -71,9 +69,9 @@
        public long SeriesID { get; set; }

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

        /// <summary>
@@ -109,16 +107,10 @@
        public double EndDiameter { get; set; }

        /// <summary>
        /// 粗糙系数
        /// 过渡件类型
        /// </summary>
        [Display(Name = "粗糙系数")]
        public double Roughness { get; set; }

        /// <summary>
        /// 算法类型
        /// </summary>
        [Display(Name = "算法类型")]
        public HStation.Assets.eAlgorithmType eAlgorithmType { get; set; }
        [Display(Name = "过渡件类型")]
        public HStation.Assets.eTranslationType TranslationType { get; set; }

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