Merge branch 'CJL' into NewFilePath

wxr

2020-12-21 064501c0cbf8643cfb2bdb2c295055189cf3287f

 HDL_ON/Entity/Function/Function.cs

@@ -294,7 +294,7 @@
                    case FunctionAttributeKey.SetTemp:
                    case FunctionAttributeKey.FanSpeed:
                    case FunctionAttributeKey.Percent:
                    case FunctionAttributeKey.FadeTime:
                    //case FunctionAttributeKey.FadeTime:
                        if (attr.curValue.ToString() == "{}")
                        {
                            attr.curValue = "0";
@@ -515,6 +515,10 @@
        /// 室内温度
        /// </summary>
        public const string IndoorTemp = "room_temp";
        /// <summary>
        /// value
        /// </summary>
        public const string Value = "value";
    }
    /// <summary>
    /// 设备功能oid