冲突处理

lixiaojun

2025-01-20 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4

 WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/AssetsCoolingFactorMgrViewModel.cs

@@ -1,17 +1,18 @@
namespace HStation.WinFrmUI
{
    /// <summary>
    /// 
    ///
    /// </summary>
    public class AssetsCoolingFactorMgrViewModel
    {
        /// <summary>
        /// 
        ///
        /// </summary>
        public AssetsCoolingFactorMgrViewModel() { }
        public AssetsCoolingFactorMgrViewModel()
        { }

        /// <summary>
        /// 
        ///
        /// </summary>
        public AssetsCoolingFactorMgrViewModel(HStation.Vmo.AssetsCoolingFactorVmo rhs)
        {
@@ -21,13 +22,12 @@
            this.Caliber = rhs.Caliber;
            this.Coefficient = rhs.Coefficient;
            this.LowerLimit = rhs.LowerLimit;
            this.SortCode = rhs.SortCode;
            this.Description = rhs.Description;
            this.Vmo = rhs;
        }

        /// <summary>
        /// 
        ///
        /// </summary>
        public void Reset(HStation.Vmo.AssetsCoolingFactorVmo rhs)
        {
@@ -37,21 +37,20 @@
            this.Caliber = rhs.Caliber;
            this.Coefficient = rhs.Coefficient;
            this.LowerLimit = rhs.LowerLimit;
            this.SortCode = rhs.SortCode;
            this.Description = rhs.Description;
            this.Vmo = rhs;
        }

        /// <summary>
        /// id
        /// </summary>  
        /// </summary>
        [Display(Name = "ID")]
        public long ID { get; set; }

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

        /// <summary>
@@ -82,7 +81,11 @@
        /// 排序码
        /// </summary>
        [Display(Name = "排序码")]
        public int SortCode { get; set; }
        public int SortCode
        {
            get { return this.Vmo.SortCode; }
            set { this.Vmo.SortCode = value; }
        }

        /// <summary>
        /// 说明
@@ -90,11 +93,9 @@
        [Display(Name = "说明")]
        public string Description { get; set; }


        /// <summary>
        /// 
        ///
        /// </summary>
        public HStation.Vmo.AssetsCoolingFactorVmo Vmo { get; set; }

    }
}
}