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/19-translation/02-main/AssetsTranslationMainMgrViewModel.cs | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AssetsTranslationMainMgrViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AssetsTranslationMainMgrViewModel.cs
index 851ba3d..c8a546c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AssetsTranslationMainMgrViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/02-main/AssetsTranslationMainMgrViewModel.cs
@@ -25,8 +25,7 @@
this.Diameter = rhs.Diameter;
this.StartDiameter = rhs.StartDiameter;
this.EndDiameter = rhs.EndDiameter;
- this.Roughness = rhs.Roughness;
- this.eAlgorithmType = rhs.eAlgorithmType;
+ this.TranslationType = rhs.TranslationType;
this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
this.TagName = rhs.TagName;
@@ -48,8 +47,7 @@
this.Diameter = rhs.Diameter;
this.StartDiameter = rhs.StartDiameter;
this.EndDiameter = rhs.EndDiameter;
- this.Roughness = rhs.Roughness;
- this.eAlgorithmType = rhs.eAlgorithmType;
+ this.TranslationType = rhs.TranslationType;
this.KeyWords = KeyWordHelper.ToString(rhs.KeyWords);
this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
this.TagName = rhs.TagName;
@@ -71,9 +69,9 @@
public long SeriesID { get; set; }
/// <summary>
- /// 鍚嶇О
+ /// 鍨嬪彿
/// </summary>
- [Display(Name = "鍚嶇О")]
+ [Display(Name = "鍨嬪彿")]
public string Name { get; set; }
/// <summary>
@@ -109,16 +107,10 @@
public double EndDiameter { get; set; }
/// <summary>
- /// 绮楃硻绯绘暟
+ /// 杩囨浮浠剁被鍨�
/// </summary>
- [Display(Name = "绮楃硻绯绘暟")]
- public double Roughness { get; set; }
-
- /// <summary>
- /// 绠楁硶绫诲瀷
- /// </summary>
- [Display(Name = "绠楁硶绫诲瀷")]
- public HStation.Assets.eAlgorithmType eAlgorithmType { get; set; }
+ [Display(Name = "杩囨浮浠剁被鍨�")]
+ public HStation.Assets.eTranslationType TranslationType { get; set; }
/// <summary>
/// 鍏抽敭瀛�
--
Gitblit v1.9.3