From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 11 十二月 2020 15:58:32 +0800 Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath --- HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs index 7dfdb0f..407b8d4 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs @@ -12,20 +12,20 @@ /// <summary> /// 浣忓畢ID /// </summary> - public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID; + public static string homeId = UserInfo.Current.CurReginID; /// <summary> /// 缃戝叧ID /// </summary> public static string gatewayId = DriverLayer.Control.Ins.GatewayId; ///// <summary> - ///// 浣忓畢ID - ///// </summary> - //public static string homeId = "1333723044544233473"; - ///// <summary> ///// 缃戝叧ID ///// </summary> - //public static string gatewayId = "1333723647223775233"; + //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