From 50863ec3601b9fabcc6952357b1ec1064c090750 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期四, 06 十一月 2025 17:19:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index aa2b52a..ce761ca 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -1,6 +1,4 @@
锘�
-using Gs.DevApp.UserControl;
-
namespace Gs.DevApp.DevFrm.User
{
partial class User
@@ -87,7 +85,7 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UcPageBar();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -867,7 +865,7 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookStaff txt_staffId;
--
Gitblit v1.9.3