From d6f0e111f50f78057ff386f7c6fef7e463d12ba5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 20 九月 2024 15:32:22 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/PumpMatchingViewModel.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/PumpMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/PumpMatchingViewModel.cs
index b09ea4a..cb9c640 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/PumpMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/PumpMatchingViewModel.cs
@@ -14,6 +14,13 @@
public string Name { get; set; }
/// <summary>
+ /// 缂栫爜
+ /// </summary>
+ [DisplayName("缂栫爜")]
+ [Browsable(true)]
+ public string Code { get; set; }
+
+ /// <summary>
/// 鍨嬪彿鍚�
/// </summary>
[DisplayName("鍨嬪彿鍚�")]
@@ -55,9 +62,9 @@
[Browsable(true)]
public bool DbLocked { get; set; }
- [DisplayName("DbID")]
+ [DisplayName("鍖归厤鍓岲bID")]
[Browsable(false)]
- public long DbID { get; set; }
+ public string DbID { get; set; }
[DisplayName("ChartDbID")]
[Browsable(false)]
--
Gitblit v1.9.3