From 8366fcbfed5c66fa1fab4f6dba964a3451c24091 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 16:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index 9908d7b..bfe670f 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -1,5 +1,7 @@
锘�
-namespace Gs.DevApp.DevFrm
+using Gs.DevApp.UserControl;
+
+namespace Gs.DevApp.DevFrm.BasicData
{
partial class Frm_Staff
{
@@ -58,7 +60,7 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.pageBar1 = new UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -773,7 +775,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidStatus;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private UserControls.Data.UcPageBar pageBar1;
+ private UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
--
Gitblit v1.9.3