Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

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

@@ -94,7 +94,7 @@
        /// 逻辑输出目标类型
        /// 设备=1;
        /// 场景=2;
        /// 安防=3;
        /// 延时=3;
        /// </summary>
        public string target_type = "";
        public List<Dictionary<string, string>> status = new List<Dictionary<string, string>>();