From 5dbe0ca9fe177aa83779ebad921b5d1d2cae6278 Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期三, 11 九月 2024 17:44:58 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- Vmo/HStation.Vmo.Assets.Core/03-AdaptingManage/AdaptingManage.cs | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Vmo/HStation.Vmo.Assets.Core/01-PumpMainManage/PumpGroup.cs b/Vmo/HStation.Vmo.Assets.Core/03-AdaptingManage/AdaptingManage.cs similarity index 61% copy from Vmo/HStation.Vmo.Assets.Core/01-PumpMainManage/PumpGroup.cs copy to Vmo/HStation.Vmo.Assets.Core/03-AdaptingManage/AdaptingManage.cs index 4745afd..9e674bf 100644 --- a/Vmo/HStation.Vmo.Assets.Core/01-PumpMainManage/PumpGroup.cs +++ b/Vmo/HStation.Vmo.Assets.Core/03-AdaptingManage/AdaptingManage.cs @@ -1,16 +1,13 @@ 锘縩amespace HStation.Vmo { - public class PumpGroup + public class AdaptingManageVmo { - /// <summary> - /// id - /// </summary> public long ID { get; set; } /// <summary> - /// 娉电郴鍒桰D + /// 璁惧绫诲瀷(寮ご,涓夐��,鍥涢��....) /// </summary> - public long PumpSeriesID { get; set; } + public eAdaptingType AdaptingType { get; set; } /// <summary> /// 鍚嶇О @@ -18,19 +15,19 @@ public string Name { get; set; } /// <summary> - /// 鍙傛暟 + /// 鍙e緞 /// </summary> - public Dictionary<string, string> Paras { get; set; } + public string Caliber { get; set; } /// <summary> - /// 鏍囩 + /// 鏉愭枡 /// </summary> - public List<string> Flags { get; set; } + public string Material { get; set; } /// <summary> - /// 鏍囧織 + /// 绯绘暟 /// </summary> - public string TagName { get; set; } + public string Coefficient { get; set; } /// <summary> /// 鎺掑簭鐮� -- Gitblit v1.9.3