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/PipeMatchingViewModel.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/01-viewmodel/PipeMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/01-viewmodel/PipeMatchingViewModel.cs
index cda786f..deeea20 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/01-viewmodel/PipeMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/01-viewmodel/PipeMatchingViewModel.cs
@@ -7,7 +7,7 @@
{
/// <summary>
- /// ID
+ /// UserID
/// </summary>
[DisplayName("ID")]
[Browsable(false)]
@@ -81,7 +81,7 @@
/// </summary>
[DisplayName("绠楁硶绫诲瀷")]
[Browsable(false)]
- public HStation.Assets.eAlgorithmType eAlgorithmType { get; set; }
+ public HStation.Assets.eTranslationType eAlgorithmType { get; set; }
--
Gitblit v1.9.3