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/AssetsPumpGroup.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpGroup.cs b/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpGroup.cs
similarity index 91%
rename from Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpGroup.cs
rename to Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpGroup.cs
index 9671db9..7a443e2 100644
--- a/Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpGroup.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpGroup.cs
@@ -20,10 +20,10 @@
public AssetsPumpGroup(AssetsPumpGroup rhs) : base(rhs)
{
this.ID = rhs.ID;
- this.PumpSeriesID = rhs.PumpSeriesID;
+ this.SeriesID = rhs.SeriesID;
this.Name = rhs.Name;
this.Paras = rhs.Paras == null ? null : new Dictionary<string, string>(rhs.Paras);
- this.PumpSeriesID = rhs.PumpSeriesID;
+ this.SeriesID = rhs.SeriesID;
this.Flags = rhs.Flags?.ToList();
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
@@ -32,7 +32,7 @@
public void Reset(AssetsPumpGroup rhs)
{
this.ID = rhs.ID;
- this.PumpSeriesID = rhs.PumpSeriesID;
+ this.SeriesID = rhs.SeriesID;
this.Name = rhs.Name;
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
@@ -49,7 +49,7 @@
/// <summary>
/// 娉电郴鍒桰D
/// </summary>
- public long PumpSeriesID { get; set; }
+ public long SeriesID { get; set; }
/// <summary>
/// 鍙傛暟
--
Gitblit v1.9.3