From 4999c3c3884084c10c8a4bb2426e92cb63600166 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 09 十一月 2024 09:58:22 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/05-pressmeter/SetHydroPressmeterWorkingInfoCtrl.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/05-pressmeter/SetHydroPressmeterWorkingInfoCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/05-pressmeter/SetHydroPressmeterWorkingInfoCtrl.cs
index a159808..e5f28fb 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/05-pressmeter/SetHydroPressmeterWorkingInfoCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/10-working/05-pressmeter/SetHydroPressmeterWorkingInfoCtrl.cs
@@ -28,7 +28,7 @@
                 return;
             }
             _parter = pressmeter;
-            this.layoutGroupCaption.Text = HydroParterCatalogHelper.GetCatalogName(Yw.Hydro.ParterCatalog.Pressmeter);
+            this.layoutGroupCaption.Text = HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pressmeter);
             if (!string.IsNullOrEmpty(parter.Name))
             {
                 this.layoutGroupCaption.Text = parter.Name;

--
Gitblit v1.9.3