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/PumpMainAndPartMap.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpMainAndPartMap.cs b/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpMainAndPartMap.cs
index c9357b5..5d4b626 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpMainAndPartMap.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpMainAndPartMap.cs
@@ -5,11 +5,11 @@
/// <summary>
/// 娉典骇鍝佹槧灏�
/// </summary>
- [SysType("pump_main_part_mapping")]
- [SugarTable("pump_main_part_mapping")]
- public class PumpMainAndPartMap : BaseEntity, System.ICloneable
+ [SysType("assets_pump_main_part_mapping")]
+ [SugarTable("assets_pump_main_part_mapping")]
+ public class AssetsPumpMainAndPartMap : BaseEntity, System.ICloneable
{
- public PumpMainAndPartMap()
+ public AssetsPumpMainAndPartMap()
{ }
/// <summary>
@@ -30,9 +30,9 @@
/// <summary>
///
/// </summary>
- public PumpMain Clone()
+ public AssetsPumpMain Clone()
{
- return (PumpMain)this.MemberwiseClone();
+ return (AssetsPumpMain)this.MemberwiseClone();
}
object ICloneable.Clone()
--
Gitblit v1.9.3