冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/02-main/AssetsFlowmeterMainMgrViewModel.cs

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

        /// <summary>
        /// 
        ///
        /// </summary>
        public AssetsFlowmeterMainMgrViewModel(HStation.Vmo.AssetsFlowmeterMainVmo rhs)
        {
@@ -29,7 +30,7 @@
        }

        /// <summary>
        /// 
        ///
        /// </summary>
        public void Reset(HStation.Vmo.AssetsFlowmeterMainVmo rhs)
        {
@@ -46,7 +47,7 @@

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

@@ -57,9 +58,9 @@
        public long SeriesID { get; set; }

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

        /// <summary>
@@ -103,9 +104,8 @@
        public string Description { get; set; }

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

    }
}
}