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/Rpt/WOTraceCodes.Designer.cs | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs index cf8e8c5..75d599c 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs @@ -1,5 +1,8 @@ /* Create By GS EasyCode */ -namespace Gs.DevApp.DevFrm + +using Gs.DevApp.UserControl; + +namespace Gs.DevApp.DevFrm.Rpt { partial class WOTraceCodes { @@ -48,7 +51,7 @@ this.daa004 = new DevExpress.XtraGrid.Columns.GridColumn(); this.processNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.nextProcessNo = new DevExpress.XtraGrid.Columns.GridColumn(); - this.pageBar1 = new UserControls.Data.UcPageBar(); + this.pageBar1 = new UcPageBar(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -336,7 +339,7 @@ private DevExpress.XtraEditors.SplitContainerControl split1; private DevExpress.XtraGrid.GridControl gcMain1; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; - private UserControls.Data.UcPageBar pageBar1; + private UcPageBar pageBar1; private DevExpress.XtraGrid.Columns.GridColumn barCode; private DevExpress.XtraGrid.Columns.GridColumn daa001; private DevExpress.XtraGrid.Columns.GridColumn lineNo1; -- Gitblit v1.9.3