处理冲突

lixiaojun

2024-10-12 a8ccc992964272f6a74631e8c164e8c91e5cb6d4

 Service/HStation.Service.Assets.Core/01-entity/07-ThreeLinkManage/ThreeLinkMain.cs

@@ -5,14 +5,14 @@
    /// <summary>
    /// 业务站
    /// </summary>
    [SysType("assets_threelink_main")]
    [SysType("assets_assets_threelink_main")]
    [SugarTable("assets_threelink_main")]
    public class ThreeLinkMain : BaseEntity, ISorter, System.ICloneable
    public class AssetsThreelinkMain : BaseEntity, ISorter, System.ICloneable
    {
        /// <summary>
        ///
        /// </summary>
        public ThreeLinkMain()
        public AssetsThreelinkMain()
        { }

        /// <summary>
@@ -63,9 +63,9 @@
        /// <summary>
        ///
        /// </summary>
        public PumpGroupAndMainMap Clone()
        public AssetsPumpGroupAndMainMap Clone()
        {
            return (PumpGroupAndMainMap)this.MemberwiseClone();
            return (AssetsPumpGroupAndMainMap)this.MemberwiseClone();
        }

        object ICloneable.Clone()