From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +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/04-NozzleManage/SprinklerSeries.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/02-model/04-NozzleManage/NozzleSeries.cs b/Service/HStation.Service.Assets.Core/02-model/04-NozzleManage/SprinklerSeries.cs
similarity index 81%
rename from Service/HStation.Service.Assets.Core/02-model/04-NozzleManage/NozzleSeries.cs
rename to Service/HStation.Service.Assets.Core/02-model/04-NozzleManage/SprinklerSeries.cs
index 9d9768d..066b0ee 100644
--- a/Service/HStation.Service.Assets.Core/02-model/04-NozzleManage/NozzleSeries.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/04-NozzleManage/SprinklerSeries.cs
@@ -5,19 +5,19 @@
/// <summary>
/// 闃�闂ㄧ郴鍒�
/// </summary>
- [SysType("nozzle_series")]
- public class NozzleSeries : BaseModel, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
+ [SysType("assets_sprinklersprinkler_series")]
+ public class AssetsSprinklerSeries : BaseModel, IParas, IFlags, ITagName, ISorter, IUseStatus, System.ICloneable
{
/// <summary>
///
/// </summary>
- public NozzleSeries()
+ public AssetsSprinklerSeries()
{ }
/// <summary>
///
/// </summary>
- public NozzleSeries(NozzleSeries rhs) : base(rhs)
+ public AssetsSprinklerSeries(AssetsSprinklerSeries rhs) : base(rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -29,7 +29,7 @@
this.Description = rhs.Description;
}
- public void Reset(NozzleSeries rhs)
+ public void Reset(AssetsSprinklerSeries rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -79,9 +79,9 @@
/// <summary>
///
/// </summary>
- public PumpSeries Clone()
+ public AssetsPumpSeries Clone()
{
- return (PumpSeries)this.MemberwiseClone();
+ return (AssetsPumpSeries)this.MemberwiseClone();
}
object ICloneable.Clone()
--
Gitblit v1.9.3