From 21b23802a3f32aebcfb77fcebda1e7cc956e21dd Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 02 十二月 2025 10:26:00 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs
index aa06d41..ebc4cf8 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.FQC
+锘縩amespace Gs.DevApp.DevFrm.FQC
{
partial class MesFqcExceptional
{
@@ -72,7 +70,7 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = 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.splitTopMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -1788,7 +1786,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
--
Gitblit v1.9.3