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/PumpGroupAndMainMap.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpGroupAndMainMap.cs b/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpGroupAndMainMap.cs
index 426e28a..828826e 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpGroupAndMainMap.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpGroupAndMainMap.cs
@@ -6,20 +6,20 @@
/// <summary>
/// 涓氬姟绔�
/// </summary>
- [SysType("xhs_pump_map")]
- [SugarTable("xhs_pump_map")]
- public class PumpGroupAndMainMap : BaseEntity, IParas, IFlags, ITagName, System.ICloneable
+ [SysType("assets_pump_group_main_mapping")]
+ [SugarTable("assets_pump_group_main_mapping")]
+ public class AssetsPumpGroupAndMainMap : BaseEntity, IParas, IFlags, ITagName, System.ICloneable
{
/// <summary>
///
/// </summary>
- public PumpGroupAndMainMap()
+ public AssetsPumpGroupAndMainMap()
{ }
/// <summary>
///
/// </summary>
- public PumpGroupAndMainMap(PumpGroupAndMainMap rhs) : base(rhs)
+ public AssetsPumpGroupAndMainMap(AssetsPumpGroupAndMainMap rhs) : base(rhs)
{
this.ID = rhs.ID;
this.PumpGroupID = rhs.PumpGroupID;
@@ -63,9 +63,9 @@
/// <summary>
///
/// </summary>
- public PumpGroupAndMainMap Clone()
+ public AssetsPumpGroupAndMainMap Clone()
{
- return (PumpGroupAndMainMap)this.MemberwiseClone();
+ return (AssetsPumpGroupAndMainMap)this.MemberwiseClone();
}
object ICloneable.Clone()
--
Gitblit v1.9.3