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/02-model/03-Elbow/AssetsElbowFactor.cs |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/Service/HStation.Service.Assets.Core/02-model/03-Elbow/AssetsElbowFactor.cs b/Service/HStation.Service.Assets.Core/02-model/03-Elbow/AssetsElbowFactor.cs
index 50f8773..0eff0f7 100644
--- a/Service/HStation.Service.Assets.Core/02-model/03-Elbow/AssetsElbowFactor.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/03-Elbow/AssetsElbowFactor.cs
@@ -22,6 +22,7 @@
             this.Caliber = rhs.Caliber;
             this.Material = rhs.Material;
             this.MinorLoss = rhs.MinorLoss;
+            this.Angle = rhs.Angle;
             this.SortCode = rhs.SortCode;
             this.Description = rhs.Description;
         }
@@ -33,6 +34,7 @@
             this.Caliber = rhs.Caliber;
             this.Material = rhs.Material;
             this.MinorLoss = rhs.MinorLoss;
+            this.Angle = rhs.Angle;
             this.SortCode = rhs.SortCode;
             this.Description = rhs.Description;
         }
@@ -58,6 +60,11 @@
         public double MinorLoss { get; set; }
 
         /// <summary>
+        /// 瑙掑害
+        /// </summary>
+        public int? Angle { get; set; }
+
+        /// <summary>
         /// 鎺掑簭鐮�
         /// </summary>
         public int SortCode { get; set; }

--
Gitblit v1.9.3