From 64dbbfe1d6488635e160189a704afccffc7d34d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:33:06 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/Entity/Function/AC.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/Function/AC.cs b/HDL_ON/Entity/Function/AC.cs
index f720477..a80f15e 100644
--- a/HDL_ON/Entity/Function/AC.cs
+++ b/HDL_ON/Entity/Function/AC.cs
@@ -182,7 +182,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)
{
@@ -208,7 +208,7 @@
{
if (_trait_fan == null)
{
- _trait_fan = function.Find((obj) => obj.key == "fan");
+ _trait_fan = attributes.Find((obj) => obj.key == "fan");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_fan == null)
{
@@ -237,7 +237,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)
{
@@ -263,7 +263,7 @@
{
if (_trait_swting == null)
{
- _trait_swting = function.Find((obj) => obj.key == "swting");
+ _trait_swting = attributes.Find((obj) => obj.key == "swting");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_swting == null)
{
--
Gitblit v1.8.0