冲突

duheng

2024-07-23 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02

 Service/HStation.Service.Assets.Core/01-entity/PumpSeries.cs

@@ -1,13 +1,12 @@
using SqlSugar;
using Yw.Entity;
using Yw.Entity;

namespace HStation.Entity
{
    /// <summary>
    /// 业务站
    /// </summary>
    [SysType("xhs-pumpseries")]
    [SugarTable("xhs-pumpseries")]
    [SysType("xhs_pumpseries")]
    [SugarTable("xhs_pumpseries")]
    public class PumpSeries : BaseEntity, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
    {
        /// <summary>
@@ -22,6 +21,7 @@
        public PumpSeries(PumpSeries rhs) : base(rhs)
        {
            this.ID = rhs.ID;
            this.CatalogID = rhs.CatalogID;
            this.Name = rhs.Name;
            this.Paras = rhs.Paras;
            this.Flags = rhs.Flags;
@@ -32,10 +32,10 @@
            this.Description = rhs.Description;
        }

        /*    /// <summary>
            /// 所属类别ID
            /// </summary>
            public long CatalogID { get; set; }*/
        /// <summary>
        /// 所属类别ID
        /// </summary>
        public long CatalogID { get; set; }

        /// <summary>
        /// 名称