Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

 HDL_ON/Entity/Function/FloorHeating.cs

@@ -59,7 +59,7 @@
            {
                if (_trait_mode == null)
                {
                    _trait_mode = function.Find((obj) => obj.key == "mode");
                    _trait_mode = attributes.Find((obj) => obj.key == "mode");
                    //找不到属性需要声明一个，防止报错闪退
                    if (_trait_mode == null)
                    {
@@ -177,7 +177,7 @@
            {
                if (_trait_temp == null)
                {
                    _trait_temp = function.Find((obj) => obj.key == "set_temperature");
                    _trait_temp = attributes.Find((obj) => obj.key == "set_temperature");
                    //找不到属性需要声明一个，防止报错闪退
                    if (_trait_temp == null)
                    {