From 9cc9ae240fd351976e6807f252dfcbaf3bfe5241 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期二, 18 十一月 2025 14:25:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
index 6c68477..3ece8fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.FQC
+锘縩amespace Gs.DevApp.DevFrm.FQC
{
partial class Frm_FQCItem
{
@@ -83,7 +81,7 @@
this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn52 = 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();
@@ -2027,7 +2025,7 @@
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
--
Gitblit v1.9.3