处理冲突

lixiaojun

2024-10-12 a8ccc992964272f6a74631e8c164e8c91e5cb6d4

 Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpMainAndPartMap.cs

@@ -5,11 +5,11 @@
    /// <summary>
    /// 泵产品映射
    /// </summary>
    [SysType("xhs_pump_mainandpartmap")]
    [SugarTable("xhs_pump_mainandpartmap")]
    public class PumpMainAndPartMap : BaseEntity, System.ICloneable
    [SysType("assets_pump_main_part_mapping")]
    [SugarTable("assets_pump_main_part_mapping")]
    public class AssetsPumpMainAndPartMap : BaseEntity, System.ICloneable
    {
        public PumpMainAndPartMap()
        public AssetsPumpMainAndPartMap()
        { }

        /// <summary>
@@ -30,9 +30,9 @@
        /// <summary>
        ///
        /// </summary>
        public PumpMain Clone()
        public AssetsPumpMain Clone()
        {
            return (PumpMain)this.MemberwiseClone();
            return (AssetsPumpMain)this.MemberwiseClone();
        }

        object ICloneable.Clone()