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/AssetsTranslationFactor.cs | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/01-entity/20-Translation/AssetsTranslationFactor.cs b/Service/HStation.Service.Assets.Core/01-entity/20-Translation/AssetsTranslationFactor.cs
index 91e8770..3179f29 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/20-Translation/AssetsTranslationFactor.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/20-Translation/AssetsTranslationFactor.cs
@@ -21,8 +21,11 @@
public AssetsTranslationFactor(AssetsTranslationFactor rhs) : base(rhs)
{
this.Name = rhs.Name;
- this.Caliber = rhs.Caliber;
this.Material = rhs.Material;
+ this.Diameter = rhs.Diameter;
+ this.StartDiameter = rhs.StartDiameter;
+ this.EndDiameter = rhs.EndDiameter;
+ this.TranslationType = rhs.TranslationType;
this.MinorLoss = rhs.MinorLoss;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
@@ -35,17 +38,32 @@
public string Name { get; set; }
/// <summary>
- /// 鍙ｅ緞
- ///</summary>
- public double? Caliber { get; set; }
-
- /// <summary>
/// 鏉愭枡
///</summary>
[SugarColumn(Length = 255, IsNullable = true)]
public string Material { get; set; }
/// <summary>
+ /// 鐩村緞
+ /// </summary>
+ public double Diameter { get; set; }
+
+ /// <summary>
+ /// 涓婃父鐩村緞
+ /// </summary>
+ public double StartDiameter { get; set; }
+
+ /// <summary>
+ /// 涓嬫父鐩村緞
+ /// </summary>
+ public double EndDiameter { get; set; }
+
+ /// <summary>
+ /// 杩囨浮浠剁被鍨�
+ /// </summary>
+ public int TranslationType { get; set; }
+
+ /// <summary>
/// 灞�闃荤郴鏁�
///</summary>
public double MinorLoss { get; set; }
--
Gitblit v1.9.3