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/Work/Frm_WorkTechniqueShow.Designer.cs | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs index f99aea1..f5447ff 100644 --- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.Designer.cs @@ -1,4 +1,6 @@ -锘縩amespace Gs.DevApp.DevFrm.QC +锘縰sing Gs.DevApp.UserControl; + +namespace Gs.DevApp.DevFrm.Work { partial class Frm_WorkTechniqueShow { @@ -104,7 +106,7 @@ this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn(); this.panBom = new DevExpress.XtraEditors.PanelControl(); - this.pageBar1 = new UserControls.Data.UcPageBar(); + this.pageBar1 = new UcPageBar(); this.splitRight = new DevExpress.XtraEditors.SplitContainerControl(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); this.gcMainCopy = new DevExpress.XtraGrid.GridControl(); @@ -1191,7 +1193,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId; private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId; private DevExpress.XtraGrid.Columns.GridColumn gv_itemId; - private UserControls.Data.UcPageBar pageBar1; + private UcPageBar pageBar1; private DevExpress.XtraGrid.Columns.GridColumn colChkInt; private DevExpress.XtraEditors.SplitContainerControl splitMx1; private DevExpress.XtraLayout.LayoutControl layoutMx1; -- Gitblit v1.9.3