From 7d041ae6788088b0d67636f0c440755d3e40247c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十二月 2020 17:24:22 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 7474bce..19d5c5a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -27,18 +27,18 @@
{
get
{
- if (Entity.DB_ResidenceData.residenceData.HomeGateway == null)
+ if (Entity.DB_ResidenceData.Instance.HomeGateway == null)
{
return DriverLayer.Control.Ins.GatewayId;
}
- return Entity.DB_ResidenceData.residenceData.HomeGateway.gatewayId;
+ return Entity.DB_ResidenceData.Instance.HomeGateway.gatewayId;
}
}
/// <summary>
/// 浣忓畢ID
/// </summary>
- public static string homeId = Entity.DB_ResidenceData.residenceData.residecenInfo.RegionID;
+ public static string homeId = Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
/// <summary>
--
Gitblit v1.8.0