From b94da76188b834922d2f13365b22208a4bc4049a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 12 十月 2024 11:33:40 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.cs
index ef49a97..0572bd1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/02-main/AddFourLinkMainDlg.cs
@@ -66,7 +66,10 @@
_FourLinkVmo.Description = DescriptionTextEdit.Text.Trim();
_FourLinkVmo.Name = TextEditName.Text.Trim();
_FourLinkVmo.KeyWord = TextEditKeyWorld.Text.Trim();
- _FourLinkVmo.MaterialName = TextEditMaterial.Text.Trim();
+ if (TextEditMaterial.Text != "榛樿")
+ {
+ _FourLinkVmo.MaterialName = TextEditMaterial.Text.Trim();
+ }
if (double.TryParse(TextEditCaliber.Text, out double caliber))
{
_FourLinkVmo.Caliber = caliber;
--
Gitblit v1.9.3