1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/Entity/Function/Fan.cs

@@ -10,7 +10,7 @@
        }

        [Newtonsoft.Json.JsonIgnore]
        public Trait trait_openLevel;
        public FunctionAttributes trait_openLevel;
        /// <summary>
        /// 档位
        /// </summary>
@@ -23,20 +23,20 @@
                {
                    if (trait_openLevel == null)
                    {
                        trait_openLevel = function.Find((obj) => obj.name == "openLevel");
                        trait_openLevel = function.Find((obj) => obj.key == "openLevel");
                        if (trait_openLevel == null)
                        {
                            trait_openLevel = new Trait()
                            trait_openLevel = new FunctionAttributes()
                            {
                                name = "openLevel",
                                value_key = new List<string> { "up", "down" },
                                key = "openLevel",
                                value = new List<string> { "up", "down" },
                                max = 7,
                                min = 0,
                            };
                        }
                        trait_openLevel.value = trait_openLevel.min;
                        trait_openLevel.curValue = trait_openLevel.min;
                    }
                    return Convert.ToInt32(trait_openLevel.value);
                    return Convert.ToInt32(trait_openLevel.curValue);
                }
                catch
                {
@@ -48,7 +48,7 @@
            {
                try
                {
                    trait_openLevel.value = value;
                    trait_openLevel.curValue = value;
                }
                catch
                {