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/05-total/HydroLossCurveTotalViewModel.cs | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-curve/total/SimulationPrintLossCurveTotalViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/05-total/HydroLossCurveTotalViewModel.cs
similarity index 61%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-curve/total/SimulationPrintLossCurveTotalViewModel.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/05-total/HydroLossCurveTotalViewModel.cs
index f07d451..32de334 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-curve/total/SimulationPrintLossCurveTotalViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/loss-curve/05-total/HydroLossCurveTotalViewModel.cs
@@ -1,26 +1,20 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HStation.WinFrmUI
+锘縩amespace Yw.WinFrmUI
{
/// <summary>
///
/// </summary>
- public class SimulationPrintLossCurveTotalViewModel
+ public class HydroLossCurveTotalViewModel
{
/// <summary>
///
/// </summary>
- public SimulationPrintLossCurveTotalViewModel() { }
+ public HydroLossCurveTotalViewModel() { }
/// <summary>
///
/// </summary>
- public SimulationPrintLossCurveTotalViewModel(List<SimulationPrintLossCurveItemViewModel> allItemList)
+ public HydroLossCurveTotalViewModel(List<HydroLossCurveItemViewModel> allItemList)
{
if (allItemList == null || allItemList.Count < 1)
{
@@ -36,17 +30,17 @@
/// <summary>
/// 姘村ご鎹熷け
/// </summary>
- public double? HeadLoss { get; set; }
+ public double HeadLoss { get; set; }
/// <summary>
/// 灞�閮ㄦ崯澶�
/// </summary>
- public double? MinorLoss { get; set; }
+ public double MinorLoss { get; set; }
/// <summary>
/// 娌跨▼鎹熷け
/// </summary>
- public double? FrictionLoss { get; set; }
+ public double FrictionLoss { get; set; }
}
}
--
Gitblit v1.9.3