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/01-AdaptingManage/UserDefined.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/02-model/01-AdaptingManage/UserDefined.cs b/Service/HStation.Service.Assets.Core/02-model/01-AdaptingManage/UserDefined.cs
index dc54b17..8617250 100644
--- a/Service/HStation.Service.Assets.Core/02-model/01-AdaptingManage/UserDefined.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/01-AdaptingManage/UserDefined.cs
@@ -6,16 +6,16 @@
/// <summary>
/// 涓氬姟绔�
/// </summary>
- [SysType("user_defined")]
- public class UserDefined : BaseModel, ISorter, System.ICloneable
+ [SysType("assets_userdefined")]
+ public class AssetsUserDefined : BaseModel, ISorter, System.ICloneable
{
/// <summary>
///
/// </summary>
- public UserDefined()
+ public AssetsUserDefined()
{ }
- public UserDefined(UserDefined rhs)
+ public AssetsUserDefined(AssetsUserDefined rhs)
{
this.AdaptingType = rhs.AdaptingType;
this.Coefficient = rhs.Coefficient;
@@ -26,7 +26,7 @@
this.Description = rhs.Description;
}
- public void Reset(UserDefined rhs)
+ public void Reset(AssetsUserDefined rhs)
{
this.AdaptingType = rhs.AdaptingType;
this.Coefficient = rhs.Coefficient;
@@ -75,9 +75,9 @@
/// <summary>
///
/// </summary>
- public PumpGroupAndMainMap Clone()
+ public AssetsPumpGroupAndMainMap Clone()
{
- return (PumpGroupAndMainMap)this.MemberwiseClone();
+ return (AssetsPumpGroupAndMainMap)this.MemberwiseClone();
}
object ICloneable.Clone()
--
Gitblit v1.9.3