From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
Dto/HStation.Dto.Assets.Core/20-Translation/02-main/AddAssetsTranslationMainInput.cs | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/Dto/HStation.Dto.Assets.Core/20-Translation/02-main/AddAssetsTranslationMainInput.cs b/Dto/HStation.Dto.Assets.Core/20-Translation/02-main/AddAssetsTranslationMainInput.cs
index 8556005..6b861e3 100644
--- a/Dto/HStation.Dto.Assets.Core/20-Translation/02-main/AddAssetsTranslationMainInput.cs
+++ b/Dto/HStation.Dto.Assets.Core/20-Translation/02-main/AddAssetsTranslationMainInput.cs
@@ -1,4 +1,7 @@
-锘縩amespace HStation.Dto
+锘縰sing HStation.Assets;
+using System.ComponentModel.DataAnnotations;
+
+namespace HStation.Dto
{
/// <summary>
/// 杩囨浮浠�
@@ -18,6 +21,11 @@
public long SeriesID { get; set; }
/// <summary>
+ /// 鏉愭枡
+ ///</summary>
+ public string Material { get; set; }
+
+ /// <summary>
/// 鐩村緞
/// </summary>
public double Diameter { get; set; }
@@ -33,19 +41,9 @@
public double EndDiameter { get; set; }
/// <summary>
- /// 绮楃硻绯绘暟
+ /// 杩囨浮浠剁被鍨�
/// </summary>
- public double Roughness { get; set; }
-
- /// <summary>
- /// 绠楁硶绫诲瀷
- /// </summary>
- public HStation.Assets.eAlgorithmType eAlgorithmType { get; set; }
-
- /// <summary>
- /// 鏉愭枡
- ///</summary>
- public string Material { get; set; }
+ public eTranslationType TranslationType { get; set; }
/// <summary>
/// 灞�闃荤郴鏁�
@@ -53,6 +51,11 @@
public double MinorLoss { get; set; }
/// <summary>
+ /// 绮楃硻绯绘暟
+ /// </summary>
+ public double Roughness { get; set; }
+
+ /// <summary>
/// 璇嗗埆鍏抽敭瀛�
/// </summary>
public List<string> KeyWords { get; set; }
--
Gitblit v1.9.3