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

lixiaojun

2024-11-18 a302d7d16e6bed80511cb49813d16829eb933560

 Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpSeriesManufacturerMapping.cs

copy from Service/HStation.Service.Assets.Core/02-model/13-Kit/AssetsKitSeries.cs
copy to Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpSeriesManufacturerMapping.cs
Îļþ´Ó Service/HStation.Service.Assets.Core/02-model/13-Kit/AssetsKitSeries.cs ¸´ÖÆ
@@ -3,51 +3,51 @@
namespace HStation.Model
{
    /// <summary>
    /// é˜€é—¨ç³»åˆ—
    ///
    /// </summary>
    [SysType("assets_kit_series")]
    public class AssetsKitSeries : BaseModel, IParas, IFlags, ITagName, ISorter, System.ICloneable
    [SysType("assets_pumpseries_manufacturer_mapping")]
    [SugarTable("assets_pumpseries_manufacturer_mapping")]
    public class AssetsPumpSeriesManufacturerMapping : BaseModel, IParas, IFlags, ITagName, System.ICloneable
    {
        /// <summary>
        ///
        /// </summary>
        public AssetsKitSeries()
        public AssetsPumpSeriesManufacturerMapping()
        { }

        /// <summary>
        ///
        /// </summary>
        public AssetsKitSeries(AssetsKitSeries rhs) : base(rhs)
        public AssetsPumpSeriesManufacturerMapping(AssetsPumpSeriesManufacturerMapping rhs) : base(rhs)
        {
            this.ParentIds = rhs.ParentIds;
            this.Name = rhs.Name;
            this.SeriesID = rhs.SeriesID;
            this.ManufacturerID = rhs.ManufacturerID;
            this.Paras = rhs.Paras;
            this.Flags = rhs.Flags;
            this.TagName = rhs.TagName;
            this.SortCode = rhs.SortCode;
            this.Flags = rhs.Flags;
            this.Description = rhs.Description;
        }

        public void Reset(AssetsKitSeries rhs)
        public void Reset(AssetsPumpSeriesManufacturerMapping rhs)
        {
            this.ParentIds = rhs.ParentIds;
            this.Name = rhs.Name;
            this.ID = rhs.ID;
            this.SeriesID = rhs.SeriesID;
            this.ManufacturerID = rhs.ManufacturerID;
            this.Paras = rhs.Paras;
            this.Flags = rhs.Flags;
            this.TagName = rhs.TagName;
            this.SortCode = rhs.SortCode;
            this.Flags = rhs.Flags;
            this.Description = rhs.Description;
        }

        /// <summary>
        /// çˆ¶çº§id列表（版本控制）
        /// ç³»åˆ—ID
        /// </summary>
        public List<long> ParentIds { get; set; }
        public long SeriesID { get; set; }

        /// <summary>
        /// åç§°
        /// åŽ‚商ID
        /// </summary>
        public string Name { get; set; }
        public long ManufacturerID { get; set; }

        /// <summary>
        /// å‚æ•°
@@ -63,11 +63,6 @@
        /// æ ‡å¿—
        /// </summary>
        public string TagName { get; set; }

        /// <summary>
        /// æŽ’序码
        /// </summary>
        public int SortCode { get; set; }

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