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/AssetsPipeMainMgrViewModel.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AssetsPipeMainMgrViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AssetsPipeMainMgrViewModel.cs
index 9fb167e..448c805 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AssetsPipeMainMgrViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AssetsPipeMainMgrViewModel.cs
@@ -62,9 +62,9 @@
public long SeriesID { get; set; }
/// <summary>
- /// 鍚嶇О
+ /// 鍨嬪彿
/// </summary>
- [Display(Name = "鍚嶇О")]
+ [Display(Name = "鍨嬪彿")]
public string Name { get; set; }
/// <summary>
@@ -82,7 +82,7 @@
/// <summary>
///Hazen
/// </summary>
- [Display(Name = "濞佸粔濮嗘柉绯绘暟")]
+ [Display(Name = "灞�闃荤郴鏁�")]
public double Hazen { get; set; }
/// <summary>
--
Gitblit v1.9.3