From a8ccc992964272f6a74631e8c164e8c91e5cb6d4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 16:47:29 +0800
Subject: [PATCH] 处理冲突
---
Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpMain.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpMain.cs b/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpMain.cs
index 54b18da..feb92a4 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpMain.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpMain.cs
@@ -5,20 +5,20 @@
/// <summary>
/// 涓氬姟绔�
/// </summary>
- [SysType("xhs_pump_main")]
- [SugarTable("xhs_pump_main")]
- public class PumpMain : BaseEntity, IParas, IFlags, ITagName, ISorter, System.ICloneable
+ [SysType("assets_pump_main")]
+ [SugarTable("assets_pump_main")]
+ public class AssetsPumpMain : BaseEntity, IParas, IFlags, ITagName, ISorter, System.ICloneable
{
/// <summary>
///
/// </summary>
- public PumpMain()
+ public AssetsPumpMain()
{ }
/// <summary>
///
/// </summary>
- public PumpMain(PumpMain rhs) : base(rhs)
+ public AssetsPumpMain(AssetsPumpMain rhs) : base(rhs)
{
this.ID = rhs.ID;
this.PumpSeriesID = rhs.PumpSeriesID;
@@ -110,9 +110,9 @@
/// <summary>
///
/// </summary>
- public PumpMain Clone()
+ public AssetsPumpMain Clone()
{
- return (PumpMain)this.MemberwiseClone();
+ return (AssetsPumpMain)this.MemberwiseClone();
}
object ICloneable.Clone()
--
Gitblit v1.9.3