From f2c1e5bf3a67478076fb5bbcf546824b3127db15 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 19:11:40 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 89cd0cb..2f6fb1e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -642,7 +642,7 @@
bool initTitleButton = true;
- foreach (var tempSensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
+ foreach (var tempSensor in FunctionList.List.sensorsEnvironmentalScience)
{
if (tempSensor.sid == sensor.sid)
{
@@ -893,7 +893,7 @@
// });
//#endif
- foreach (var sr in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
+ foreach (var sr in FunctionList.List.sensorsEnvironmentalScience)
{
if (sr.functionType != sensor.functionType)
{
--
Gitblit v1.8.0