Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-03-08 f8bafd162ad7adf2f21986389568d650b71f976b

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

@@ -9,14 +9,7 @@
        {
            Tag = "Logic";
        }
        /// <summary>
        /// 默认选中是房间时：全部区域
        /// </summary>
        private Entity.Room selectedRoom = new Entity.Room { roomId = "6688" };
        /// <summary>
        /// 表示是(条件/目标)
        /// </summary>
        private string if_type = LogicMethod.condition_if;
       
        public void Show()
        {
            LogicView.TopView topView = new LogicView.TopView();