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/AssetsPumpSeriesTypeMapping.cs |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpTypeSeriesMap.cs b/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpSeriesTypeMapping.cs
similarity index 60%
rename from Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpTypeSeriesMap.cs
rename to Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpSeriesTypeMapping.cs
index 52238c7..eac0081 100644
--- a/Service/HStation.Service.Assets.Core/02-model/01-PumpMain/PumpTypeSeriesMap.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpSeriesTypeMapping.cs
@@ -5,42 +5,42 @@
     /// <summary>
     /// 涓氬姟绔�
     /// </summary>
-    [SysType("assets_pump_type_series_mapping")]
-    public class AssetsPumpTypeSeriesMap : BaseModel, ISorter, System.ICloneable
+    [SysType("assets_pump_series_type_mapping")]
+    public class AssetsPumpSeriesTypeMapping : BaseModel, ISorter, System.ICloneable
     {        /// <summary>
              ///
              /// </summary>
-        public AssetsPumpTypeSeriesMap()
+        public AssetsPumpSeriesTypeMapping()
         { }
 
         /// <summary>
         ///
         /// </summary>
-        public AssetsPumpTypeSeriesMap(AssetsPumpTypeSeriesMap rhs) : base(rhs)
+        public AssetsPumpSeriesTypeMapping(AssetsPumpSeriesTypeMapping rhs) : base(rhs)
         {
             this.ID = rhs.ID;
-            this.PumpSeriesID = rhs.PumpSeriesID;
-            this.PumpTypeID = rhs.PumpTypeID;
+            this.SeriesID = rhs.SeriesID;
+            this.TypeID = rhs.TypeID;
             this.SortCode = rhs.SortCode;
         }
 
-        public void Reset(AssetsPumpTypeSeriesMap rhs)
+        public void Reset(AssetsPumpSeriesTypeMapping rhs)
         {
             this.ID = rhs.ID;
-            this.PumpSeriesID = rhs.PumpSeriesID;
-            this.PumpTypeID = rhs.PumpTypeID;
+            this.SeriesID = rhs.SeriesID;
+            this.TypeID = rhs.TypeID;
             this.SortCode = rhs.SortCode;
         }
 
         /// <summary>
         /// 娉靛瀷鍙稩D
         /// </summary>
-        public long PumpSeriesID { get; set; }
+        public long SeriesID { get; set; }
 
         /// <summary>
         /// 绫诲瀷ID
         /// </summary>
-        public long PumpTypeID { get; set; }
+        public long TypeID { get; set; }
 
         /// <summary>
         /// 鎺掑簭鐮�

--
Gitblit v1.9.3