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/03-Elbow/AssetsElbowFactor.cs | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/01-entity/03-Elbow/AssetsElbowFactor.cs b/Service/HStation.Service.Assets.Core/01-entity/03-Elbow/AssetsElbowFactor.cs
index 94ab9b0..28d7def 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/03-Elbow/AssetsElbowFactor.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/03-Elbow/AssetsElbowFactor.cs
@@ -22,11 +22,15 @@
this.Caliber = rhs.Caliber;
this.Material = rhs.Material;
this.MinorLoss = rhs.MinorLoss;
+ this.Angle = rhs.Angle;
+ this.SortCode = rhs.SortCode;
+ this.Description = rhs.Description;
}
/// <summary>
/// 鍚嶇О
/// </summary>
+ [SugarColumn(Length = 50, IsNullable = true)]
public string Name { get; set; }
/// <summary>
@@ -37,6 +41,8 @@
/// <summary>
/// 鏉愭枡
/// </summary>
+
+ [SugarColumn(Length = 100, IsNullable = true)]
public string Material { get; set; }
/// <summary>
@@ -45,6 +51,11 @@
public double MinorLoss { get; set; }
/// <summary>
+ /// 瑙掑害
+ /// </summary>
+ public int? Angle { get; set; }
+
+ /// <summary>
/// 鎺掑簭鐮�
/// </summary>
public int SortCode { get; set; }
--
Gitblit v1.9.3