From 0b0f37c86f484b10d911b56b77968f832ce69bbb Mon Sep 17 00:00:00 2001 From: ningshuxia <ningshuxia0927@outlook.com> Date: 星期四, 27 三月 2025 11:51:22 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs index 9c5362b..b19a39a 100644 --- a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs +++ b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs @@ -205,11 +205,13 @@ if (hour == 23) { var item = hourList.Find(x => x.EndHour == 23); + return el * item.Price; } else { var item = hourList.Find(x => hour >= x.StartHour && hour < x.EndHour); + return el * item.Price; } } -- Gitblit v1.9.3