From 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 十月 2024 11:18:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/ElbowMain.cs |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/ElbowMain.cs b/Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/ElbowMain.cs
index 8e5372f..ce5d528 100644
--- a/Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/ElbowMain.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/ElbowMain.cs
@@ -1,4 +1,5 @@
-锘縰sing Yw.Model;
+锘縰sing HStation.Assets;
+using Yw.Model;
 
 namespace HStation.Model
 {
@@ -25,7 +26,9 @@
             this.MaterialName = rhs.MaterialName;
             this.SortCode = rhs.SortCode;
             this.Name = rhs.Name;
+            this.Angle = rhs.Angle;
             this.Description = rhs.Description;
+            this.ConnectionLength = rhs.ConnectionLength;
         }
 
         public void Reset(AssetsElbowMain rhs)
@@ -39,7 +42,9 @@
             this.MaterialName = rhs.MaterialName;
             this.SortCode = rhs.SortCode;
             this.Name = rhs.Name;
+            this.Angle = rhs.Angle;
             this.Description = rhs.Description;
+            this.ConnectionLength = rhs.ConnectionLength;
         }
 
         /// <summary>
@@ -58,6 +63,16 @@
         public double? Caliber { get; set; }
 
         /// <summary>
+        /// 绠¤矾杩炴帴闀垮害
+        /// </summary>
+        public eLengthType? ConnectionLength { get; set; }
+
+        /// <summary>
+        /// 瑙掑害
+        /// </summary>
+        public int? Angle { get; set; }
+
+        /// <summary>
         /// 鏉愭枡
         /// </summary>
         public string MaterialName { get; set; }

--
Gitblit v1.9.3