From 9c8743941f556a486ba2cc5bcb8a7a6ec1079d0a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 11:55:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AdaptingViewModel.cs | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AdaptingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AdaptingViewModel.cs
index a5af1ac..edd42ac 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AdaptingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/02-AdaptingManage/AdaptingViewModel.cs
@@ -14,7 +14,14 @@
this.Coefficient = rhs.Coefficient;
this.Material = rhs.Material;
this.ID = rhs.ID;
- this.Caliber = rhs.Caliber;
+ if (rhs.Caliber == null)
+ {
+ this.Caliber = "榛樿";
+ }
+ else
+ {
+ this.Caliber = rhs.Caliber.ToString();
+ }
this.Description = rhs.Description;
this.Name = rhs.Name;
this.SortCode = rhs.SortCode;
@@ -26,7 +33,14 @@
this.Coefficient = rhs.Coefficient;
this.Material = rhs.Material;
this.ID = rhs.ID;
- this.Caliber = rhs.Caliber;
+ if (rhs.Caliber == null)
+ {
+ this.Caliber = "榛樿";
+ }
+ else
+ {
+ this.Caliber = rhs.Caliber.ToString();
+ }
this.Description = rhs.Description;
this.Name = rhs.Name;
this.SortCode = rhs.SortCode;
@@ -70,7 +84,7 @@
/// </summary>
[DisplayName("鎹熷け绯绘暟")]
[Browsable(true)]
- public string Coefficient { get; set; }
+ public double? Coefficient { get; set; }
/// <summary>
/// 鎺掑簭鐮�
--
Gitblit v1.9.3