From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
Service/HStation.Service.Assets.Core/01-entity/20-Translation/AssetsTranslationMain.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/01-entity/20-Translation/AssetsTranslationMain.cs b/Service/HStation.Service.Assets.Core/01-entity/20-Translation/AssetsTranslationMain.cs
index 0d69c4b..4b1426e 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/20-Translation/AssetsTranslationMain.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/20-Translation/AssetsTranslationMain.cs
@@ -26,7 +26,7 @@
this.StartDiameter = rhs.StartDiameter;
this.EndDiameter = rhs.EndDiameter;
this.Roughness = rhs.Roughness;
- this.eAlgorithmType = rhs.eAlgorithmType;
+ this.TranslationType = rhs.TranslationType;
this.Material = rhs.Material;
this.MinorLoss = rhs.MinorLoss;
this.KeyWords = rhs.KeyWords;
@@ -69,9 +69,9 @@
public double Roughness { get; set; }
/// <summary>
- /// 绠楁硶绫诲瀷
+ /// 杩囨浮浠剁被鍨�
/// </summary>
- public int eAlgorithmType { get; set; }
+ public int TranslationType { get; set; }
/// <summary>
/// 鏉愭枡
--
Gitblit v1.9.3