From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AssetsSprinklerMainMgrViewModel.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AssetsSprinklerMainMgrViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AssetsSprinklerMainMgrViewModel.cs
index 6d6164d..2e9c171 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AssetsSprinklerMainMgrViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/AssetsSprinklerMainMgrViewModel.cs
@@ -65,7 +65,7 @@
public long SeriesID { get; set; }
/// <summary>
- /// 鍚嶇О
+ /// 鍨嬪彿
/// </summary>
[Display(Name = "鍨嬪彿")]
public string Name { get; set; }
@@ -73,7 +73,7 @@
/// <summary>
/// 鍙ｅ緞
/// </summary>
- [Display(Name = "鍙ｅ緞")]
+ [Display(Name = "鍙ｅ緞(mm)")]
public double? Caliber { get; set; }
/// <summary>
--
Gitblit v1.9.3