From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突
---
Service/HStation.Service.Assets.Core/01-entity/PumpSeries.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/01-entity/PumpSeries.cs b/Service/HStation.Service.Assets.Core/01-entity/PumpSeries.cs
index e18cf8d..d909730 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/PumpSeries.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/PumpSeries.cs
@@ -1,13 +1,12 @@
-锘縰sing SqlSugar;
-using Yw.Entity;
+锘縰sing 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>
- /// 鎵�灞炵被鍒獻D
- /// </summary>
- public long CatalogID { get; set; }*/
+ /// <summary>
+ /// 鎵�灞炵被鍒獻D
+ /// </summary>
+ public long CatalogID { get; set; }
/// <summary>
/// 鍚嶇О
--
Gitblit v1.9.3