From 5d8b95b69c1bf800f2a2ebee62c6f7181c0bd7c8 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 27 十一月 2024 16:35:46 +0800
Subject: [PATCH] 冲突
---
Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs b/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs
index b95ef99..5eda6d2 100644
--- a/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs
+++ b/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.cs
@@ -3,6 +3,7 @@
using DevExpress.XtraBars.Ribbon;
using DevExpress.XtraEditors;
using HStation.WinFrmUI;
+using HStation.WinFrmUI.Auth;
using HStation.WinFrmUI.Basic;
using HStation.WinFrmUI.Organize;
using HStation.WinFrmUI.Xhs.PumpProduct;
@@ -266,10 +267,10 @@
};
if (!IsExistPage(guid, true))
{
- //var page = new RoleMainMgrPanel();
- //page.PageTitle.Caption = guid.Function;
- //page.PageGuid = guid;
- //CreatePage(page, guid);
+ /* var page = new MenuMgrMainPanel();
+ page.PageTitle.Caption = guid.Function;
+ page.PageGuid = guid;
+ CreatePage(page, guid);*/
}
}
--
Gitblit v1.9.3