From 13e69c09c5ac97e0294d64617dfb934e34bb4264 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 02 十二月 2024 17:11:13 +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/03-Elbow/AssetsElbowMain.cs | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/02-model/03-Elbow/AssetsElbowMain.cs b/Service/HStation.Service.Assets.Core/02-model/03-Elbow/AssetsElbowMain.cs
index 2eb038d..3400050 100644
--- a/Service/HStation.Service.Assets.Core/02-model/03-Elbow/AssetsElbowMain.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/03-Elbow/AssetsElbowMain.cs
@@ -7,7 +7,7 @@
/// 涓氬姟绔�
/// </summary>
[SysType("assets_elbow_main")]
- public class AssetsElbowMain : BaseModel, ISorter, System.ICloneable
+ public class AssetsElbowMain : BaseModel, ISorter, IFlags, IParas, ITagName, System.ICloneable
{
/// <summary>
///
@@ -23,8 +23,11 @@
this.Material = rhs.Material;
this.Angle = rhs.Angle;
this.MinorLoss = rhs.MinorLoss;
- this.ElbowLengthType = rhs.ElbowLengthType;
+ this.ElbowType = rhs.ElbowType;
this.KeyWord = rhs.KeyWord;
+ this.Paras = rhs.Paras == null ? null : new Dictionary<string, string>(rhs.Paras);
+ this.Flags = rhs.Flags?.ToList();
+ this.TagName = rhs.TagName;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -38,8 +41,11 @@
this.Material = rhs.Material;
this.Angle = rhs.Angle;
this.MinorLoss = rhs.MinorLoss;
- this.ElbowLengthType = rhs.ElbowLengthType;
+ this.ElbowType = rhs.ElbowType;
this.KeyWord = rhs.KeyWord;
+ this.Paras = rhs.Paras == null ? null : new Dictionary<string, string>(rhs.Paras);
+ this.Flags = rhs.Flags?.ToList();
+ this.TagName = rhs.TagName;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -62,7 +68,7 @@
/// <summary>
/// 绠¤矾杩炴帴闀垮害
/// </summary>
- public eLengthType? ElbowLengthType { get; set; }
+ public eElbowType? ElbowType { get; set; }
/// <summary>
/// 瑙掑害
@@ -80,6 +86,21 @@
public double MinorLoss { get; set; }
/// <summary>
+ /// 鍙傛暟
+ /// </summary>
+ public Dictionary<string, string> Paras { get; set; }
+
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public List<string> Flags { get; set; }
+
+ /// <summary>
+ /// 鏍囧織
+ /// </summary>
+ public string TagName { get; set; }
+
+ /// <summary>
/// 璇嗗埆鍏抽敭瀛�
/// </summary>
public List<string> KeyWord { get; set; }
--
Gitblit v1.9.3