From 855d6d0e62af450f66e8a4ebcd06415f5a6814f1 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 10 十二月 2025 23:18:04 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
index 29d07ce..928e7bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
@@ -1,6 +1,4 @@
-锘縰sing Gs.DevApp.UserControl;
-
-namespace Gs.DevApp.DevFrm.WW
+锘縩amespace Gs.DevApp.DevFrm.WW
{
partial class WwBlclDj
{
@@ -66,7 +64,7 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = 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();
@@ -1517,7 +1515,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
- private UcPageBar pageBar1;
+ private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.TextEdit txt_orgIdTxt;
--
Gitblit v1.9.3