From b83a01eec16b236d099dcea3e7a5051c8cae9c6c Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期五, 03 七月 2020 10:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Model/WarningSet.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Common.Model/Model/WarningSet.cs b/src/Bro.Common.Model/Model/WarningSet.cs
index a57dbab..ebabb2c 100644
--- a/src/Bro.Common.Model/Model/WarningSet.cs
+++ b/src/Bro.Common.Model/Model/WarningSet.cs
@@ -10,7 +10,7 @@
/// <summary>
/// PLC璀︽姤閰嶇疆
/// </summary>
- public class WarningSet : IComplexDisplay, IWarningSet
+ public class PLCWarningSet : IComplexDisplay, IWarningSet
{
[Category("绱㈠紩璁剧疆")]
[Description("PLC璀︽姤绱㈠紩鈥斺�斿瓧绱㈠紩")]
@@ -99,7 +99,7 @@
[Category("璀︽姤璁剧疆")]
[DisplayName("璀︽姤绫诲瀷")]
[Description("璀︽姤璁剧疆锛氳繍鍔ㄦ澘鍗� IO 绫诲瀷锛圛N OUT锛�")]
- public IOModel WarningIOModel { get; set; }
+ public IOType WarningIOModel { get; set; }
[Category("瑙﹀彂璁剧疆")]
[Description("true锛氶珮鐢靛钩瑙﹀彂鎶ヨ false锛氫綆鐢靛钩瑙﹀彂鎶ヨ")]
--
Gitblit v1.8.0