From 3f24b14f07ef82526b2e1d56cc808f226e91cbb9 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期五, 20 十二月 2024 21:47:33 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- Dto/HStation.Dto.Assets.Core/15-Tank/01-AssetsTankSeries/AssetsTankSeriesDto.cs | 83 ++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 42 deletions(-) diff --git a/Dto/HStation.Dto.Assets.Core/15-Tank/01-AssetsTankSeries/AssetsTankSeriesDto.cs b/Dto/HStation.Dto.Assets.Core/15-Tank/01-AssetsTankSeries/AssetsTankSeriesDto.cs index 20d6377..465c1ff 100644 --- a/Dto/HStation.Dto.Assets.Core/15-Tank/01-AssetsTankSeries/AssetsTankSeriesDto.cs +++ b/Dto/HStation.Dto.Assets.Core/15-Tank/01-AssetsTankSeries/AssetsTankSeriesDto.cs @@ -2,76 +2,75 @@ { /// <summary> /// 姘存睜绯诲垪 - ///</summary> + ///</summary> public class AssetsTankSeriesDto { - /// <summary> - /// - /// </summary> - public AssetsTankSeriesDto() { } + /// <summary> + /// + /// </summary> + public AssetsTankSeriesDto() + { } - /// <summary> - /// - /// </summary> - public AssetsTankSeriesDto(Model.AssetsTankSeries rhs) - { - this.ID=rhs.ID; - this.CatalogID=rhs.CatalogID; - this.Name=rhs.Name; - this.ParentIds = rhs.ParentIds?.ToList(); - this.Paras = rhs.Paras == null ? null : new (rhs.Paras); + /// <summary> + /// + /// </summary> + public AssetsTankSeriesDto(Model.AssetsTankSeries rhs) + { + this.ID = rhs.ID; + this.CatalogID = rhs.CatalogID; + this.Name = rhs.Name; + this.ParentID = rhs.ParentIds.LastOrDefault(); + this.Paras = rhs.Paras == null ? null : new(rhs.Paras); this.Flags = rhs.Flags?.ToList(); - this.TagName=rhs.TagName; - this.SortCode=rhs.SortCode; - this.Description=rhs.Description; - } + this.TagName = rhs.TagName; + this.SortCode = rhs.SortCode; + this.Description = rhs.Description; + } /// <summary> /// ID - ///</summary> + ///</summary> public long ID { get; set; } - + /// <summary> /// 鎵�灞炵被鍒獻D - ///</summary> + ///</summary> public long CatalogID { get; set; } - + /// <summary> /// 鍚嶇О - ///</summary> + ///</summary> public string Name { get; set; } - + /// <summary> - /// 鐖剁骇id鍒楄〃锛堢増鏈帶鍒� - ///</summary> - public List<long> ParentIds { get; set; } - + /// 鐖剁骇id + /// </summary> + [Required] + public long ParentID { get; set; } + /// <summary> /// 鍙傛暟 - ///</summary> + ///</summary> public Dictionary<string, string> Paras { get; set; } - + /// <summary> /// 鏍囩 - ///</summary> + ///</summary> public List<string> Flags { get; set; } - + /// <summary> /// 鏍囧織 - ///</summary> + ///</summary> public string TagName { get; set; } - + /// <summary> /// 鎺掑簭鐮� - ///</summary> + ///</summary> public int SortCode { get; set; } - + /// <summary> /// 璇存槑 - ///</summary> + ///</summary> public string Description { get; set; } - - } -} - +} \ No newline at end of file -- Gitblit v1.9.3