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/PumpPartMain.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpPartMain.cs b/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpPartMain.cs
index a8f3d64..a2cecdb 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpPartMain.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/06-PumpMainManage/PumpPartMain.cs
@@ -5,11 +5,11 @@
/// <summary>
/// 娉典骇鍝�
/// </summary>
- [SysType("xhs_pump_partmain")]
- [SugarTable("xhs_pump_partmain")]
- public class PumpPartMain : BaseEntity, ISorter, System.ICloneable
+ [SysType("assets_pump_part_main")]
+ [SugarTable("assets_pump_part_main")]
+ public class AssetsPumpPartMain : BaseEntity, ISorter, System.ICloneable
{
- public PumpPartMain()
+ public AssetsPumpPartMain()
{ }
/// <summary>
@@ -40,9 +40,9 @@
/// <summary>
///
/// </summary>
- public PumpPartMain Clone()
+ public AssetsPumpPartMain Clone()
{
- return (PumpPartMain)this.MemberwiseClone();
+ return (AssetsPumpPartMain)this.MemberwiseClone();
}
object ICloneable.Clone()
--
Gitblit v1.9.3