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/17-hydrant/02-main/AddAssetsHydrantMainDlg.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.cs
index 7148d25..5c9dc01 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.cs
@@ -97,7 +97,7 @@
_vmo.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
_vmo.TagName = this.txtTagName.Text.Trim();
_vmo.Description = this.txtDescription.Text.Trim();
- _vmo.Caliber = double.Parse(this.txtCaliber.EditValue?.ToString());
+ _vmo.Caliber = this.txtCaliber.EditValue == null ? null : double.Parse(this.txtCaliber.EditValue?.ToString());
_vmo.Material = this.txtMaterial.Text.Trim();
var id = await BLLFactory<HStation.BLL.AssetsHydrantMain>.Instance.Insert(_vmo);
if (id < 1)
--
Gitblit v1.9.3