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/04-pipe/02-main/AddAssetsPipeMainDlg.cs | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.cs
index b21b001..f0ce751 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.cs
@@ -92,6 +92,7 @@
return;
}
_vmo.Name = this.txtName.Text.Trim();
+ _vmo.Caliber = this.txtCaliber.EditValue == null ? null : double.Parse(this.txtCaliber.EditValue?.ToString());
_vmo.KeyWords = HStation.Service.Assets.KeyWordHelper.ToList(this.txtKeyWord.Text.Trim());
_vmo.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
_vmo.TagName = this.txtTagName.Text.Trim();
--
Gitblit v1.9.3