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/06-PumpMainManage/PumpType.cs |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Service/HStation.Service.Assets.Core/02-model/06-PumpMainManage/PumpType.cs b/Service/HStation.Service.Assets.Core/02-model/06-PumpMainManage/PumpType.cs
index 83a7db9..5fe66e8 100644
--- a/Service/HStation.Service.Assets.Core/02-model/06-PumpMainManage/PumpType.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/06-PumpMainManage/PumpType.cs
@@ -5,18 +5,18 @@
     /// <summary>
     /// 涓氬姟绔�
     /// </summary>
-    [SysType("pump_type")]
-    public class PumpType : BaseModel, ISorter, System.ICloneable
+    [SysType("assets_pump_type")]
+    public class AssetsPumpType : BaseModel, ISorter, System.ICloneable
     {        /// <summary>
              ///
              /// </summary>
-        public PumpType()
+        public AssetsPumpType()
         { }
 
         /// <summary>
         ///
         /// </summary>
-        public PumpType(PumpType rhs) : base(rhs)
+        public AssetsPumpType(AssetsPumpType rhs) : base(rhs)
         {
             this.ID = rhs.ID;
             this.Name = rhs.Name;
@@ -25,7 +25,7 @@
             this.SortCode = rhs.SortCode;
         }
 
-        public void Reset(PumpType rhs)
+        public void Reset(AssetsPumpType rhs)
         {
             this.ID = rhs.ID;
             this.Name = rhs.Name;
@@ -54,9 +54,9 @@
         /// </summary>
         public string Description { get; set; }
 
-        public PumpType Clone()
+        public AssetsPumpType Clone()
         {
-            return (PumpType)this.MemberwiseClone();
+            return (AssetsPumpType)this.MemberwiseClone();
         }
 
         object ICloneable.Clone()

--
Gitblit v1.9.3