处理冲突

lixiaojun

2024-10-12 a8ccc992964272f6a74631e8c164e8c91e5cb6d4

 Service/HStation.Service.Assets.Core/02-model/08-ValveManage/ValveMain.cs

@@ -7,19 +7,18 @@
    /// 业务站
    /// </summary>
    [SysType("assets_valve_main")]
    [SugarTable("assets_valve_main")]
    public class ValveMain : BaseModel, ISorter, System.ICloneable
    public class AssetsValveMain : BaseModel, ISorter, System.ICloneable
    {
        /// <summary>
        ///
        /// </summary>
        public ValveMain()
        public AssetsValveMain()
        { }

        /// <summary>
        ///
        /// </summary>
        public ValveMain(ValveMain rhs) : base(rhs)
        public AssetsValveMain(AssetsValveMain rhs) : base(rhs)
        {
            this.ID = rhs.ID;
            this.Description = rhs.Description;
@@ -33,7 +32,7 @@
            this.Coefficient = rhs.Coefficient;
        }

        public void Reset(ValveMain rhs)
        public void Reset(AssetsValveMain rhs)
        {
            this.ID = rhs.ID;
            this.Description = rhs.Description;
@@ -65,7 +64,7 @@
        /// <summary>
        /// 类型
        /// </summary>
        public eValveSeriesType Type { get; set; }
        public eAssetsValveSeriesType Type { get; set; }

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

        object ICloneable.Clone()