处理冲突

lixiaojun

2024-10-12 a8ccc992964272f6a74631e8c164e8c91e5cb6d4

 Service/HStation.Service.Assets.Core/02-model/10-ManufacturerMapping/ManufacturerMapping.cs

@@ -7,13 +7,13 @@
    /// <summary>
    /// 厂商
    /// </summary>
    [SysType("manufacturer_mapping")]
    public class ManufacturerMapping : BaseModel, System.ICloneable
    [SysType("assets_AssetsManufacturer_mapping")]
    public class AssetsManufacturerMapping : BaseModel, System.ICloneable
    {
        public ManufacturerMapping()
        public AssetsManufacturerMapping()
        { }

        public ManufacturerMapping(ManufacturerMapping rhs) : base(rhs)
        public AssetsManufacturerMapping(AssetsManufacturerMapping rhs) : base(rhs)
        {
            this.ID = rhs.ID;
            this.ManufactuerID = rhs.ManufactuerID;
@@ -22,7 +22,7 @@
            this.Description = rhs.Description;
        }

        public void Reset(ManufacturerMapping rhs)
        public void Reset(AssetsManufacturerMapping rhs)
        {
            this.ID = rhs.ID;
            this.ManufactuerID = rhs.ManufactuerID;
@@ -54,9 +54,9 @@
        /// <summary>
        ///
        /// </summary>
        public Manufacturer Clone()
        public AssetsManufacturer Clone()
        {
            return (Manufacturer)this.MemberwiseClone();
            return (AssetsManufacturer)this.MemberwiseClone();
        }

        object ICloneable.Clone()