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/Rpt/Ckcgmx.Designer.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs
index 4b2d809..475a9f7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/Ckcgmx.Designer.cs
@@ -1,4 +1,6 @@
-锘縩amespace Gs.DevApp.DevFrm.Rpt
+锘縰sing Gs.DevApp.UserControl;
+
+namespace Gs.DevApp.DevFrm.Rpt
{
partial class Ckcgmx
{
@@ -49,7 +51,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_ownerId = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.pageBar1 = new UcPageBar();
this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -565,7 +567,7 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
- private UserControls.Data.UcPageBar pageBar1;
+ private UcPageBar pageBar1;
private DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView gridView1;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_guid;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_itemBarcode;
--
Gitblit v1.9.3