From eb558bff1083279d01d87e94820f97cc3f294d18 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 09 十二月 2022 10:07:29 +0800
Subject: [PATCH] Merge branch 'wjc' into dev--wxr
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index d9b1b60..7aeb9f2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -741,7 +741,7 @@
break;
}
- outputDevice.status = dicSateteList;
+ outputDevice.status.AddRange(dicSateteList);
if (edit)
{
@@ -957,7 +957,7 @@
if (dicList.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = dicList;
+ dicSateteList.AddRange(dicList);
}
if (this.btnDelay != null)
{
--
Gitblit v1.8.0