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/BasicData/Frm_MesWorkshopLine.Designer.cs | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
index 38cbbfa..9d61670 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -1,8 +1,5 @@
/* Create By GS EasyCode */
-
-using Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.BasicData
+namespace Gs.DevApp.DevFrm
{
partial class Frm_MesWorkshopLine
{
@@ -60,7 +57,7 @@
this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = 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();
@@ -721,7 +718,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_lineType;
private DevExpress.XtraGrid.Columns.GridColumn gv_isZxbg;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookDepartment txt_dptId;
--
Gitblit v1.9.3