Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-18 f2d122dc78c58925a05d770d716e7fefcbd784ef

 HDL_ON/Entity/Function/Function.cs

old mode 100644
new mode 100755
@@ -235,7 +235,7 @@
            }
            if (roomNameList == "" && functionType == FunctionType.Scene)
            {
                roomNameList = Language.StringByID(StringId.WholeHouseScene);
                roomNameList = Language.StringByID(StringId.WholeZone);
            }
            return roomNameList;
        }
@@ -643,15 +643,15 @@
        /// <summary>
        /// 家电、插座
        /// </summary>
        public const string ElectricSocket = "electric.socket ";

        public const string ElectricSocket = "electrical.socket";

        /// <summary>
        /// 家电、电视
        /// </summary>
        public const string ElectricTV = "electric.tv";

        public const string ElectricTV = "electrical.tv";

        /// <summary>
        /// 家电、风扇
        /// </summary>
        public const string ElectricFan = "electric.fan";
        public const string ElectricFan = "electrical.fan";
    }

}