Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

Shuxia Ning

2024-11-08 0cd48df8ccca96a8a0117a508c342a90dc2eacb8

 Dto/HStation.Dto.Assets.Core/08-Sprinkler/01-SprinklerMain/AssetsSprinklerMainDto.cs

ÎļþÃû´Ó Dto/HStation.Dto.Assets.Core/08-NozzleManage/02-NozzleMain/NozzleMainDto.cs ÐÞ¸Ä
@@ -2,24 +2,23 @@

namespace HStation.Dto.Assets
{
    public class AssetsNozzleMainDto
    public class AssetsSprinklerMainDto
    {
        public AssetsNozzleMainDto()
        public AssetsSprinklerMainDto()
        { }

        public AssetsNozzleMainDto(Model.AssetsSprinklerMain rhs)
        public AssetsSprinklerMainDto(Model.AssetsSprinklerMain rhs)
        {
            this.ID = rhs.ID;
            this.MaterialName = rhs.MaterialName;
            this.Material = rhs.Material;
            this.Caliber = rhs.Caliber;
            this.Coefficient = rhs.Coefficient;
            this.MinorLoss = rhs.MinorLoss;
            this.Description = rhs.Description;
            this.SortCode = rhs.SortCode;
            this.KeyWord = rhs.KeyWord;
            this.IsDefault = rhs.IsDefault;
            this.SeriesID = rhs.SeriesID;
            this.Angle = rhs.Angle;
            this.Flowcoefficient = rhs.Flowcoefficient;
            this.FlowMinorLoss = rhs.FlowMinorLoss;
        }

        public long ID { get; set; }
@@ -35,24 +34,29 @@
        public long SeriesID { get; set; }

        /// <summary>
        /// è§’度
        /// </summary>
        public string Angle { get; set; }

        /// <summary>
        /// å£å¾„
        /// </summary>
        public double? Caliber { get; set; }

        /// <summary>
        /// ææ–™
        /// </summary>
        public string Material { get; set; }

        /// <summary>
        /// è§’度
        /// </summary>
        public int? Angle { get; set; }

        /// <summary>
        /// å–·å°„系数
        /// </summary>
        public double? Coefficient { get; set; }
        public double MinorLoss { get; set; }

        /// <summary>
        /// æµé‡ç³»æ•°
        /// </summary>
        private double? Flowcoefficient { get; set; }
        private double? FlowMinorLoss { get; set; }

        /// <summary>
        /// æŽ’序码
@@ -62,17 +66,7 @@
        /// <summary>
        /// è¯†åˆ«å…³é”®å­—
        /// </summary>
        public string KeyWord { get; set; }

        /// <summary>
        /// æ˜¯å¦é»˜è®¤
        /// </summary>
        public bool IsDefault { get; set; }

        /// <summary>
        /// ææ–™
        /// </summary>
        public string MaterialName { get; set; }
        public List<string> KeyWord { get; set; }

        /// <summary>
        /// è¯´æ˜Ž