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/WW/WwBlclDj.Designer.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
index 928e7bc..29d07ce 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
@@ -1,4 +1,6 @@
-锘縩amespace Gs.DevApp.DevFrm.WW
+锘縰sing Gs.DevApp.UserControl;
+
+namespace Gs.DevApp.DevFrm.WW
{
partial class WwBlclDj
{
@@ -64,7 +66,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 UserControls.Data.UcPageBar();
+ this.pageBar1 = new UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -1515,7 +1517,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
- private UserControls.Data.UcPageBar pageBar1;
+ private UcPageBar pageBar1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.TextEdit txt_orgIdTxt;
--
Gitblit v1.9.3