Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-24 8413f493d6e527c3f71cf704c6b22212e94a6c60

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

old mode 100755
new mode 100644
@@ -14,7 +14,7 @@
        /// <summary>
        /// 默认选中是房间时：全部区域
        /// </summary>
        private Entity.Room selectedRoom = new Entity.Room { uid = Language.StringByID(StringId.allAreas) };
        private Entity.Room selectedRoom = new Entity.Room { roomId ="6688" };
        /// <summary>
        /// 表示是(条件/目标)
        /// </summary>