From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs
index 94c3f39..67e101c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs
@@ -39,10 +39,10 @@
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
@@ -54,10 +54,10 @@
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
- ((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)layoutControlItem6).BeginInit();
((ISupportInitialize)layoutControlItem7).BeginInit();
+ ((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
@@ -168,24 +168,13 @@
layoutControlItem3.Text = "鍙ｅ緞:";
layoutControlItem3.TextSize = new Size(59, 14);
//
- // layoutControlItem4
- //
- layoutControlItem4.AllowHtmlStringInCaption = true;
- layoutControlItem4.Control = txtCoefficient;
- layoutControlItem4.Location = new Point(252, 24);
- layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(253, 24);
- layoutControlItem4.Text = "<color=red>*</color>灞�闃荤郴鏁�:";
- layoutControlItem4.TextSize = new Size(59, 14);
- //
// layoutControlItem2
//
- layoutControlItem2.AllowHtmlStringInCaption = true;
layoutControlItem2.Control = txtMaterial;
layoutControlItem2.Location = new Point(0, 24);
layoutControlItem2.Name = "layoutControlItem2";
layoutControlItem2.Size = new Size(252, 24);
- layoutControlItem2.Text = "<color=red>*</color>鏉愯川:";
+ layoutControlItem2.Text = "鏉愯川:";
layoutControlItem2.TextSize = new Size(59, 14);
//
// layoutControlItem6
@@ -205,6 +194,16 @@
layoutControlItem7.Size = new Size(505, 30);
layoutControlItem7.TextSize = new Size(0, 0);
layoutControlItem7.TextVisible = false;
+ //
+ // layoutControlItem4
+ //
+ layoutControlItem4.AllowHtmlStringInCaption = true;
+ layoutControlItem4.Control = txtCoefficient;
+ layoutControlItem4.Location = new Point(252, 24);
+ layoutControlItem4.Name = "layoutControlItem4";
+ layoutControlItem4.Size = new Size(253, 24);
+ layoutControlItem4.Text = "<color=red>*</color>灞�闃荤郴鏁�:";
+ layoutControlItem4.TextSize = new Size(59, 14);
//
// dxErrorProvider1
//
@@ -229,10 +228,10 @@
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
- ((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)layoutControlItem6).EndInit();
((ISupportInitialize)layoutControlItem7).EndInit();
+ ((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
--
Gitblit v1.9.3