From 145b157ba183ebf877c93ed2dbb01ec737c993d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:59:33 +0800
Subject: [PATCH] Merge branch 'WJC'

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 5807ebf..ad9473e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -9,23 +9,23 @@
 {
     public  class Send
     {
-        ///// <summary>
-        ///// 浣忓畢ID
-        ///// </summary>
-        //public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID;
-        ///// <summary>
-        ///// 缃戝叧ID
-        ///// </summary>
-        //public static string gatewayId = DriverLayer.Control.Ins.GatewayId;
-
         /// <summary>
         /// 浣忓畢ID
         /// </summary>
-        public static string homeId = "1333723044544233473";
+        public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID;
         /// <summary>
         /// 缃戝叧ID
         /// </summary>
-        public static string gatewayId = "1333723647223775233";
+        public static string gatewayId = DriverLayer.Control.Ins.GatewayId;
+
+        ///// <summary>
+        ///// 缃戝叧ID
+        ///// </summary>
+        //public static string gatewayId =Entity.DB_ResidenceData.residenceData.HomeGateway.gatewayId;
+        ///// <summary>
+        ///// 浣忓畢ID
+        ///// </summary>
+        //public static string homeId = Entity.DB_ResidenceData.residenceData.HomeGateway.homeId;
 
         /// <summary>
         /// 鑾峰彇閫昏緫ID鍒楄〃

--
Gitblit v1.8.0