From 5b6ffebeeee53e375cf8f8d5c30c51f03ad1d96e Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 09 七月 2020 19:12:42 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Process/ProcessConfig.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/Bro.Process/ProcessConfig.cs b/src/Bro.Process/ProcessConfig.cs
index dcff227..1dc98f4 100644
--- a/src/Bro.Process/ProcessConfig.cs
+++ b/src/Bro.Process/ProcessConfig.cs
@@ -66,7 +66,7 @@
[Description("榛樿鎿嶄綔閰嶇疆闆嗗悎")]
[DisplayName("榛樿鎿嶄綔閰嶇疆")]
[TypeConverter(typeof(CollectionCountConvert))]
- [Editor(typeof(ComplexCollectionEditor<SimpleMonitorSet>), typeof(UITypeEditor))]
+ [Editor(typeof(ComplexCollectionEditor<MonitorSetBase>), typeof(UITypeEditor))]
public List<IMonitorSet> MonitorSetCollection { get; set; } = new List<IMonitorSet>();
public virtual List<IInitialConfig> GetAllDeviceInitialConfigs()
@@ -75,6 +75,7 @@
configs.AddRange(CameraConfigCollection);
configs.AddRange(PLCConfigCollection);
+ configs.AddRange(DeviceConfigs);
return configs;
}
--
Gitblit v1.8.0