From a302d7d16e6bed80511cb49813d16829eb933560 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 18 十一月 2024 09:34:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpGroupAndMainMapping.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpGroupAndMainMap.cs b/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpGroupAndMainMapping.cs
similarity index 66%
rename from Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpGroupAndMainMap.cs
rename to Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpGroupAndMainMapping.cs
index 78ff2a5..cf9d496 100644
--- a/Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpGroupAndMainMap.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpGroupAndMainMapping.cs
@@ -6,48 +6,48 @@
/// 涓氬姟绔�
/// </summary>
[SysType("assets_pump_group_main_mapping")]
- public class AssetsPumpGroupAndMainMap : BaseModel, IParas, IFlags, ITagName, System.ICloneable
+ public class AssetsPumpGroupAndMainMapping : BaseModel, IParas, IFlags, ITagName, System.ICloneable
{
/// <summary>
///
/// </summary>
- public AssetsPumpGroupAndMainMap()
+ public AssetsPumpGroupAndMainMapping()
{ }
/// <summary>
///
/// </summary>
- public AssetsPumpGroupAndMainMap(AssetsPumpGroupAndMainMap rhs) : base(rhs)
+ public AssetsPumpGroupAndMainMapping(AssetsPumpGroupAndMainMapping rhs) : base(rhs)
{
this.ID = rhs.ID;
- this.PumpGroupID = rhs.PumpGroupID;
+ this.GroupID = rhs.GroupID;
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
- this.PumpMainID = rhs.PumpMainID;
+ this.MainID = rhs.MainID;
this.TagName = rhs.TagName;
this.Description = rhs.Description;
}
- public void Reset(AssetsPumpGroupAndMainMap rhs)
+ public void Reset(AssetsPumpGroupAndMainMapping rhs)
{
this.ID = rhs.ID;
- this.PumpGroupID = rhs.PumpGroupID;
+ this.GroupID = rhs.GroupID;
this.Paras = rhs.Paras;
- this.PumpMainID = rhs.PumpMainID;
+ this.MainID = rhs.MainID;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
this.Description = rhs.Description;
}
/// <summary>
- /// 娉电粍ID
+ /// 缁処D
/// </summary>
- public long PumpGroupID { get; set; }
+ public long GroupID { get; set; }
/// <summary>
- /// 娉靛瀷鍙稩D
+ /// 鍨嬪彿ID
/// </summary>
- public long PumpMainID { get; set; }
+ public long MainID { get; set; }
/// <summary>
/// 鍙傛暟
@@ -72,9 +72,9 @@
/// <summary>
///
/// </summary>
- public AssetsPumpGroupAndMainMap Clone()
+ public AssetsPumpGroupAndMainMapping Clone()
{
- return (AssetsPumpGroupAndMainMap)this.MemberwiseClone();
+ return (AssetsPumpGroupAndMainMapping)this.MemberwiseClone();
}
object ICloneable.Clone()
--
Gitblit v1.9.3