From a5b25c4f314079d293bf159ed6f0d7dcbadadbb7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 19 二月 2025 10:46:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/01-core/HydroLossCurvePointVieModel.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/00-core/HydroLossCurvePointVieModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/01-core/HydroLossCurvePointVieModel.cs
similarity index 82%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/00-core/HydroLossCurvePointVieModel.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/01-core/HydroLossCurvePointVieModel.cs
index 52fc7a9..804db75 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/18-loss/00-core/HydroLossCurvePointVieModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/01-core/HydroLossCurvePointVieModel.cs
@@ -14,31 +14,31 @@
/// <summary>
///
/// </summary>
- public HydroLossCurvePointVieModel(string code, string name, double x, double y)
+ public HydroLossCurvePointVieModel(string name, string code, double x, double y)
{
- this.Code = code;
this.Name = name;
+ this.Code = code;
this.X = Math.Round(x, 2);
this.Y = Math.Round(y, 2);
}
/// <summary>
- ///
- /// </summary>
- public string Code { get; set; }
-
- /// <summary>
- ///
+ /// 鍚嶇О
/// </summary>
public string Name { get; set; }
/// <summary>
- ///
+ /// 缂栫爜
+ /// </summary>
+ public string Code { get; set; }
+
+ /// <summary>
+ /// X鍧愭爣
/// </summary>
public double X { get; set; }
/// <summary>
- /// Y
+ /// Y鍧愭爣
/// </summary>
public double Y { get; set; }
--
Gitblit v1.9.3