Merge branch 'Dev-Branch' into hxb

hxb

2022-09-22 39cf2411b59772d56ee731f229f09ff472889bad

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

@@ -98,9 +98,14 @@
        /// 某个逻辑/场景的输出条件=7;
        /// 地理围栏=8;
        /// 空气质量=9(废弃);
        /// 可视对讲=9;
        /// 场景=10;
        /// </summary>
        public string condition_type = "";
        /// <summary>
        /// condition_type=9时使用
        /// </summary>
        public string identifier = "";
        public List<Dictionary<string, string>> condition = new List<Dictionary<string, string>>();
        /// <summary>
        /// 地理围栏配置