冲突缺少文件补充

duheng

2024-09-23 651d1f87d2e0e26021c20f3667e1db7b1349b478

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/03-hydraulic-simulation/01-PumpMainCurveChoice/PumpMainChoieViewModel.cs

@@ -2,14 +2,14 @@
{
    public class PumpMainCurveChoieViewModel
    {
        public PumpMainCurveChoieViewModel(Vmo.PumpSeries rhs)
        public PumpMainCurveChoieViewModel(Vmo.PumpSeriesVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
            this.IsPump = false;
        }

        public PumpMainCurveChoieViewModel(Vmo.PumpGroup rhs)
        public PumpMainCurveChoieViewModel(Vmo.PumpGroupVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -17,7 +17,7 @@
            this.IsPump = false;
        }

        public PumpMainCurveChoieViewModel(Vmo.PumpMain rhs, long GroupID)
        public PumpMainCurveChoieViewModel(Vmo.PumpMainVmo rhs, long GroupID)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -25,7 +25,7 @@
            this.IsPump = true;
        }

        public PumpMainCurveChoieViewModel(Vmo.PumpMain rhs)
        public PumpMainCurveChoieViewModel(Vmo.PumpMainVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -89,7 +89,7 @@
        /// <summary>
        /// 额定效率
        /// </summary>
        public double RatedEfficiency { get; set; }
        public double? RatedEfficiency { get; set; }

        /// <summary>
        /// 额定功率