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.Xhs.Core/03-simulation/07-matching/01-viewmodel/ElbowMatchingViewModel.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/01-viewmodel/ElbowMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/01-viewmodel/ElbowMatchingViewModel.cs
index 31c3759..da212ca 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/01-viewmodel/ElbowMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/01-viewmodel/ElbowMatchingViewModel.cs
@@ -6,7 +6,7 @@
     public class ElbowMatchingViewModel
     {
         /// <summary>
-        /// ID
+        /// UserID
         /// </summary>
         [DisplayName("ID")]
         [Browsable(false)]

--
Gitblit v1.9.3