From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AssetsThreelinkMainMgrPage.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AssetsThreelinkMainMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AssetsThreelinkMainMgrPage.cs
index ce99bec..8049907 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AssetsThreelinkMainMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AssetsThreelinkMainMgrPage.cs
@@ -329,7 +329,7 @@
                 {
                     Modular = AssetsFunctionHelper.Modular,
                     MoudingType = eMoudingType.Tab,
-                    Function = AssetsFunctionHelper.NozzleFactorMgr,
+                    Function = AssetsFunctionHelper.ThreelinkFactorMgr,
                     TagName = string.Empty
                 };
                 if (!IsExistPage(guid, true))

--
Gitblit v1.9.3