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/14-tank/02-main/AssetsTankMainMgrViewModel.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AssetsTankMainMgrViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AssetsTankMainMgrViewModel.cs
index 6de9e2f..5e2b02f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AssetsTankMainMgrViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/02-main/AssetsTankMainMgrViewModel.cs
@@ -66,7 +66,7 @@
         public long SeriesID { get; set; }
 
         /// <summary>
-        /// 鍚嶇О
+        /// 鍨嬪彿
         /// </summary>
         [Display(Name = "鍨嬪彿")]
         public string Name { get; set; }

--
Gitblit v1.9.3