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/04-Fourlink/AssetsFourlinkMain.cs | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Service/HStation.Service.Assets.Core/02-model/04-Fourlink/AssetsFourlinkMain.cs b/Service/HStation.Service.Assets.Core/02-model/04-Fourlink/AssetsFourlinkMain.cs index 4f38927..392d784 100644 --- a/Service/HStation.Service.Assets.Core/02-model/04-Fourlink/AssetsFourlinkMain.cs +++ b/Service/HStation.Service.Assets.Core/02-model/04-Fourlink/AssetsFourlinkMain.cs @@ -6,7 +6,7 @@ /// 涓氬姟绔� /// </summary> [SysType("assets_fourlink_main")] - public class AssetsFourlinkMain : BaseModel, ISorter, System.ICloneable + public class AssetsFourlinkMain : BaseModel, ISorter, IFlags, IParas, ITagName, System.ICloneable { /// <summary> /// @@ -22,6 +22,9 @@ this.MinorLoss = rhs.MinorLoss; this.Caliber = rhs.Caliber; this.Material = rhs.Material; + 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; } @@ -29,12 +32,15 @@ public void Reset(AssetsFourlinkMain rhs) { this.ID = rhs.ID; + this.Name = rhs.Name; this.SeriesID = rhs.SeriesID; this.MinorLoss = rhs.MinorLoss; this.Caliber = rhs.Caliber; this.Material = rhs.Material; this.SortCode = rhs.SortCode; - this.Name = rhs.Name; + this.Paras = rhs.Paras == null ? null : new Dictionary<string, string>(rhs.Paras); + this.Flags = rhs.Flags?.ToList(); + this.TagName = rhs.TagName; this.Description = rhs.Description; } @@ -69,6 +75,21 @@ public List<string> KeyWord { 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 int SortCode { get; set; } -- Gitblit v1.9.3