From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/ViewAssetsCompressorMainDlg.cs | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/ViewAssetsCompressorMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/ViewAssetsCompressorMainDlg.cs
index 2635caa..54470ba 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/ViewAssetsCompressorMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/02-main/ViewAssetsCompressorMainDlg.cs
@@ -1,16 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Yw;
-
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
{
public partial class ViewAssetsCompressorMainDlg : DevExpress.XtraEditors.XtraForm
{
@@ -20,7 +8,6 @@
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
this.layoutControl1.SetupLayoutControl();
}
-
private HStation.Vmo.AssetsCompressorMainVmo _vmo = null;
@@ -37,13 +24,11 @@
this.txtName.EditValue = vmo.Name;
this.txtMaterial.EditValue = vmo.Material;
this.txtDiameter.EditValue = vmo.Diameter;
- this.txtCoefficient.EditValue = vmo.MinorLoss;
+ this.txtMinorLoss.EditValue = vmo.MinorLoss;
this.txtKeyWord.EditValue = HStation.Service.Assets.KeyWordHelper.ToString(vmo.KeyWords);
this.txtFlags.EditValue = Yw.Untity.FlagsHelper.ToString(vmo.Flags);
this.txtTagName.EditValue = vmo.TagName;
this.txtDescription.EditValue = vmo.Description;
}
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3