From 0f17fd41975f2b0e05905a8b7752bac5804ac37d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 26 三月 2021 17:41:14 +0800
Subject: [PATCH] Merge branch 'wjc'
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
index 218722e..24c5ec1 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
@@ -362,7 +362,8 @@
Timer timer = new Timer ();
var jay = jArray [a];
timer.id = jay ["id"].ToString ();
- timer.timerName = jay ["timerName"].ToString ();
+ timer.timerName =jay ["timerName"].ToString ();
+ timer.RoomName = jay ["room"].ToString ();
timer.userId = jay ["userId"].ToString ();
timer.isEnable = Boolean.Parse (jay ["isEnable"].ToString ());
timer.executeUtcTime = SmartHome.Method.GetLocalUtcTime(jay ["executeUtcTime"].ToString ());
--
Gitblit v1.8.0