From aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 21:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/Entity/Function/Sensor.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
old mode 100644
new mode 100755
index 598d621..e482294
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -49,7 +49,7 @@
{
if (trait_values == null)
{
- trait_values = function.Find((obj) => obj.key == "values");
+ trait_values = attributes.Find((obj) => obj.key == "values");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_values == null)
{
@@ -99,7 +99,7 @@
{
if (trait_values == null)
{
- trait_values = function.Find((obj) => obj.key == "values");
+ trait_values = attributes.Find((obj) => obj.key == "values");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_values == null)
{
--
Gitblit v1.8.0