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.Auth.Core/02-User/UserMgrMainPanel.cs | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-User/UserMgrMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-User/UserMgrMainPanel.cs
index b212d15..6c4d160 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-User/UserMgrMainPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/02-User/UserMgrMainPanel.cs
@@ -1,14 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Yw.WinFrmUI;
+锘縰sing Yw.WinFrmUI;
namespace HStation.WinFrmUI.Auth.Core._02_User
{
@@ -18,22 +8,25 @@
{
InitializeComponent();
}
+ //Yw.Vmo.ProjectMenu
+ //Yw.BLL.ProjectMenu.ReferenceEqual
//娣诲姞
- private void UserAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void AddMenu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
var dlg = new AddUserDlg();
dlg.ShowDialog();
}
//淇敼鐢ㄦ埛
- private void UserEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void EditMenu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
var dlg = new UpdateUserDlg();
dlg.ShowDialog();
}
//鍒犻櫎
- private void UserDelete_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void DeleteMenu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
}
+
}
}
--
Gitblit v1.9.3