From 9a9fb7a9e71b45bc3b91a0c48373e12d385680b8 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 01 七月 2020 19:44:31 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Model/MonitorSet.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/Bro.Common.Model/Model/MonitorSet.cs b/src/Bro.Common.Model/Model/MonitorSet.cs
index 50f977a..9635218 100644
--- a/src/Bro.Common.Model/Model/MonitorSet.cs
+++ b/src/Bro.Common.Model/Model/MonitorSet.cs
@@ -15,7 +15,7 @@
namespace Bro.Common.Model
{
- public class SimpleMonitorSet : IMonitorSet, IComplexDisplay
+ public class MonitorSetBase : IMonitorSet, IComplexDisplay
{
[Browsable(false)]
public string Id { get; set; } = Guid.NewGuid().ToString();
@@ -76,7 +76,7 @@
}
}
- public SimpleMonitorSet() { }
+ public MonitorSetBase() { }
public virtual string GetDisplayText()
{
@@ -122,7 +122,7 @@
/// <summary>
/// PLC鐩戝惉璁剧疆
/// </summary>
- public class MonitorSet : SimpleMonitorSet
+ public class PLCMonitorSet : MonitorSetBase
{
/// <summary>
/// 鐩戝惉鍦板潃绱㈠紩 鎸夌収鐩戝惉鍦板潃浠�0寮�濮嬬殑绱㈠紩
@@ -165,7 +165,7 @@
[DisplayName("閫氱煡鍦板潃")]
public int NoticeAddress { get; set; } = -1;
- public MonitorSet() { }
+ public PLCMonitorSet() { }
public override string GetDisplayText()
{
@@ -180,7 +180,7 @@
/// <summary>
/// 杩愬姩鏉垮崱鐩戝惉閰嶇疆瀵硅薄
/// </summary>
- public class MotionCardMonitorSet : SimpleMonitorSet
+ public class MotionCardMonitorSet : MonitorSetBase
{
/// <summary>
/// 鐩戝惉绫诲瀷
--
Gitblit v1.8.0