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/BasicData/Frm_MesUnit.Designer.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index 0a9d048..9cf7456 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -1,5 +1,8 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm
+
+using Gs.DevApp.UserControl;
+
+namespace Gs.DevApp.DevFrm.BasicData
{
partial class Frm_MesUnit
{
@@ -58,7 +61,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = 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();
@@ -84,8 +87,8 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -342,7 +345,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 13;
+ this.gridColumn1.VisibleIndex = 12;
this.gridColumn1.Width = 180;
//
// gridColumn2
@@ -359,8 +362,6 @@
this.gridColumn3.FieldName = "id";
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 12;
this.gridColumn3.Width = 94;
//
// gridColumn4
@@ -783,7 +784,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fdescription;
private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidstatus;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private UserControls.Data.UcPageBar pageBar1;
+ private UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
--
Gitblit v1.9.3