Merge remote-tracking branch 'origin/master'

啊鑫

2025-09-12 8366fcbfed5c66fa1fab4f6dba964a3451c24091

 DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs

@@ -1,4 +1,7 @@
/* Create By GS EasyCode */

using Gs.DevApp.UserControl;

namespace Gs.DevApp.DevFrm.Rpt
{
    partial class CPMX
@@ -48,7 +51,7 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.pageBar1 = new UcPageBar();
            this.gridControl1 = new DevExpress.XtraGrid.GridControl();
            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -496,7 +499,7 @@
        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
        private DevExpress.XtraEditors.SplitContainerControl split1;
        private UserControls.Data.UcPageBar pageBar1;
        private UcPageBar pageBar1;
        private DevExpress.XtraGrid.GridControl gcMain1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;