From 5851291c78b2cb5532e6938c77b5f51eb06a6ad2 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 21 十二月 2020 19:41:07 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/Entity/Function/Sensor.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index 598d621..3244716 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -49,13 +49,13 @@
{
if (trait_values == null)
{
- trait_values = function.Find((obj) => obj.key == "values");
+ trait_values = attributes.Find((obj) => obj.key == FunctionAttributeKey.Value);
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_values == null)
{
trait_values = new FunctionAttributes()
{
- key = "values",
+ key = FunctionAttributeKey.Value,
value = new List<string> { "29" },
max = 10000,
min = 0,
@@ -99,13 +99,13 @@
{
if (trait_values == null)
{
- trait_values = function.Find((obj) => obj.key == "values");
+ trait_values = attributes.Find((obj) => obj.key == FunctionAttributeKey.Value);
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (trait_values == null)
{
trait_values = new FunctionAttributes()
{
- key = "values",
+ key = FunctionAttributeKey.Value,
value = new List<string> { "up" },
max = 100,
min = 0,
--
Gitblit v1.8.0