From dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 04 十二月 2020 16:06:47 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/Entity/Function/FloorHeating.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/FloorHeating.cs b/HDL_ON/Entity/Function/FloorHeating.cs
index a3af174..f4f8407 100644
--- a/HDL_ON/Entity/Function/FloorHeating.cs
+++ b/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)
{
--
Gitblit v1.8.0