From ad4360df5a1245151efc826bee69b63946426891 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 23 十二月 2024 17:50:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/BluntheadManageMainPage.Designer.cs |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/BluntheadManageMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/BluntheadManageMainPage.Designer.cs
index 8a61037..f73efab 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/BluntheadManageMainPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/BluntheadManageMainPage.Designer.cs
@@ -28,8 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BluntheadManageMainPage));
+            components = new Container();
+            ComponentResourceManager resources = new ComponentResourceManager(typeof(BluntheadManageMainPage));
             ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
             BtnAdd = new DevExpress.XtraBars.BarButtonItem();
             BtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -54,13 +54,13 @@
             dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
             dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
             BluntheadTreeListCtrl1 = new BluntheadTreeListCtrl();
-            ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)svgImageCollection1).BeginInit();
+            ((ISupportInitialize)ribbonControl1).BeginInit();
+            ((ISupportInitialize)svgImageCollection1).BeginInit();
             sidePanel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)BluntheadViewModelBindingSource).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
+            ((ISupportInitialize)gridControl1).BeginInit();
+            ((ISupportInitialize)BluntheadViewModelBindingSource).BeginInit();
+            ((ISupportInitialize)gridView1).BeginInit();
+            ((ISupportInitialize)dockManager1).BeginInit();
             dockPanel1.SuspendLayout();
             dockPanel1_Container.SuspendLayout();
             SuspendLayout();
@@ -198,7 +198,7 @@
             colCaliber.FieldName = "Caliber";
             colCaliber.Name = "colCaliber";
             colCaliber.Visible = true;
-            colCaliber.VisibleIndex = 3;
+            colCaliber.VisibleIndex = 4;
             colCaliber.Width = 85;
             // 
             // colDescription
@@ -216,7 +216,7 @@
             colKeyWord.FieldName = "KeyWord";
             colKeyWord.Name = "colKeyWord";
             colKeyWord.Visible = true;
-            colKeyWord.VisibleIndex = 1;
+            colKeyWord.VisibleIndex = 2;
             colKeyWord.Width = 128;
             // 
             // colMaterial
@@ -224,14 +224,14 @@
             colMaterial.FieldName = "Material";
             colMaterial.Name = "colMaterial";
             colMaterial.Visible = true;
-            colMaterial.VisibleIndex = 2;
+            colMaterial.VisibleIndex = 3;
             // 
             // colMinorLoss
             // 
             colMinorLoss.FieldName = "MinorLoss";
             colMinorLoss.Name = "colMinorLoss";
             colMinorLoss.Visible = true;
-            colMinorLoss.VisibleIndex = 4;
+            colMinorLoss.VisibleIndex = 1;
             // 
             // dockManager1
             // 
@@ -280,14 +280,14 @@
             Controls.Add(dockPanel1);
             Name = "BluntheadManageMainPage";
             Size = new Size(890, 520);
-            ((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
-            ((System.ComponentModel.ISupportInitialize)svgImageCollection1).EndInit();
+            ((ISupportInitialize)ribbonControl1).EndInit();
+            ((ISupportInitialize)svgImageCollection1).EndInit();
             sidePanel1.ResumeLayout(false);
             sidePanel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
-            ((System.ComponentModel.ISupportInitialize)BluntheadViewModelBindingSource).EndInit();
-            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
-            ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
+            ((ISupportInitialize)gridControl1).EndInit();
+            ((ISupportInitialize)BluntheadViewModelBindingSource).EndInit();
+            ((ISupportInitialize)gridView1).EndInit();
+            ((ISupportInitialize)dockManager1).EndInit();
             dockPanel1.ResumeLayout(false);
             dockPanel1_Container.ResumeLayout(false);
             ResumeLayout(false);

--
Gitblit v1.9.3