Merge branch 'WJC' into wxr7

wxr

2021-08-20 46a5de6e9871c5c52ba4195576c1c2a4725abb08

 HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs

@@ -112,6 +112,10 @@
        /// </summary>
        public string sid = "";
        /// <summary>
        /// 逻辑输出目标延时间(单位用秒)
        /// </summary>
        public string delay = "0";
        /// <summary>
        /// 逻辑输出目标类型
        /// 设备=1;
        /// 场景=2;