From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index d4c9df7..461b095 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -519,7 +519,7 @@
         {
             get
             {
-                return Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
+                return Entity.DB_ResidenceData.Instance.CurrentRegion.id;
             }
         }
         /// <summary>
@@ -529,7 +529,7 @@
         {
             get
             {
-                return Entity.DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+                return Entity.DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
             }
         }
     }

--
Gitblit v1.8.0