冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 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)
        {
@@ -26,7 +27,7 @@
        }

        /// <summary>
        /// 
        ///
        /// </summary>
        public void Reset(HStation.Vmo.AssetsCoolingFactorVmo rhs)
        {
@@ -42,14 +43,14 @@

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

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

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


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

    }
}
}