From 3add06f19c3c68289ca58fb61d15dfa059c5c8f5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 22 七月 2021 09:21:07 +0800
Subject: [PATCH] Merge branch 'wxr7-ez' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7-ez
---
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockHistoryInfoPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockHistoryInfoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockHistoryInfoPage.cs
index 44db3a1..0deeb41 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockHistoryInfoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockHistoryInfoPage.cs
@@ -121,7 +121,7 @@
if (this.listMember != null) { return true; }
//涓昏处鍙烽渶瑕佸幓鑾峰彇鎴愬憳鍒楄〃,鑰屽瓙璐﹀彿鍙兘浠栬嚜宸�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
{
//鑾峰彇鎴愬憳鍒楄〃
var responePack = new DAL.Server.HttpServerRequest().GetResidenceMemberAccount();
@@ -146,7 +146,7 @@
//鑷韩鍔犺繘鍘�,鑷繁浣嶄簬棣栦綅
var info = new ResidenceMemberInfo();
info.childAccountId = OnAppConfig.Instance.LastLoginUserId;
- info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false ? "ADMIN" : "ORDINARY";
+ info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false ? "ADMIN" : "ORDINARY";
info.nickName = UserInfo.Current.userName;
this.listMember.Insert(0, info);
if (string.IsNullOrEmpty(info.nickName))
--
Gitblit v1.8.0