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/ItemQL.Designer.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
index db5aeb0..af5128a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
@@ -1,4 +1,7 @@
/* Create By GS EasyCode */
+
+using Gs.DevApp.UserControl;
+
namespace Gs.DevApp.DevFrm.Rpt
{
partial class ItemQL
@@ -46,7 +49,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.pageBar1 = new UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -153,6 +156,7 @@
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowFooter = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
// gridColumn1
@@ -318,7 +322,7 @@
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private UserControls.Data.UcPageBar pageBar1;
+ private UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn itemName;
private DevExpress.XtraGrid.Columns.GridColumn itemModel;
private DevExpress.XtraGrid.Columns.GridColumn itemNo1;
--
Gitblit v1.9.3