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/02-model/08-ValveManage/ValveMain.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/02-model/08-ValveManage/ValveMain.cs b/Service/HStation.Service.Assets.Core/02-model/08-ValveManage/ValveMain.cs
index d61c50b..e2ee0e1 100644
--- a/Service/HStation.Service.Assets.Core/02-model/08-ValveManage/ValveMain.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/08-ValveManage/ValveMain.cs
@@ -7,19 +7,18 @@
/// 涓氬姟绔�
/// </summary>
[SysType("assets_valve_main")]
- [SugarTable("assets_valve_main")]
- public class ValveMain : BaseModel, ISorter, System.ICloneable
+ public class AssetsValveMain : BaseModel, ISorter, System.ICloneable
{
/// <summary>
///
/// </summary>
- public ValveMain()
+ public AssetsValveMain()
{ }
/// <summary>
///
/// </summary>
- public ValveMain(ValveMain rhs) : base(rhs)
+ public AssetsValveMain(AssetsValveMain rhs) : base(rhs)
{
this.ID = rhs.ID;
this.Description = rhs.Description;
@@ -33,7 +32,7 @@
this.Coefficient = rhs.Coefficient;
}
- public void Reset(ValveMain rhs)
+ public void Reset(AssetsValveMain rhs)
{
this.ID = rhs.ID;
this.Description = rhs.Description;
@@ -65,7 +64,7 @@
/// <summary>
/// 绫诲瀷
/// </summary>
- public eValveSeriesType Type { get; set; }
+ public eAssetsValveSeriesType Type { get; set; }
/// <summary>
/// 鏉愭枡
@@ -100,9 +99,9 @@
/// <summary>
///
/// </summary>
- public PumpMain Clone()
+ public AssetsPumpMain Clone()
{
- return (PumpMain)this.MemberwiseClone();
+ return (AssetsPumpMain)this.MemberwiseClone();
}
object ICloneable.Clone()
--
Gitblit v1.9.3