From 208ca42e1c20afafbe48d66259d553ee81eb48ed Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 13 十一月 2024 11:02:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 Vmo/HStation.Vmo.Assets.Core/13-Compressor/AssetsCompressorMainVmo.cs |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Vmo/HStation.Vmo.Assets.Core/13-Compressor/AssetsCompressorMainVmo.cs b/Vmo/HStation.Vmo.Assets.Core/13-Compressor/AssetsCompressorMainVmo.cs
index 1f6719b..3a0ba2b 100644
--- a/Vmo/HStation.Vmo.Assets.Core/13-Compressor/AssetsCompressorMainVmo.cs
+++ b/Vmo/HStation.Vmo.Assets.Core/13-Compressor/AssetsCompressorMainVmo.cs
@@ -5,34 +5,29 @@
         public long ID { get; set; }
 
         /// <summary>
-        /// 绯诲垪ID
-        /// </summary>
-        public long SeriesID { get; set; }
-
-        /// <summary>
         /// 鍚嶇О
         /// </summary>
         public string Name { get; set; }
 
         /// <summary>
+        /// 绯诲垪ID
+        /// </summary>
+        public long SeriesID { get; set; }
+
+        /// <summary>
         /// 鏉愭枡
         /// </summary>
-        public string MaterialName { get; set; }
+        public string Material { get; set; }
 
         /// <summary>
         /// 绯绘暟
         /// </summary>
-        public double? Coefficient { get; set; }
+        public double MinorLoss { get; set; }
 
         /// <summary>
         /// 璇嗗埆鍏抽敭瀛�
         /// </summary>
-        public string KeyWord { get; set; }
-
-        /// <summary>
-        /// 鏄惁榛樿
-        /// </summary>
-        public bool IsDefault { get; set; }
+        public List<string> KeyWord { get; set; }
 
         /// <summary>
         /// 鎺掑簭鐮�

--
Gitblit v1.9.3