From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
old mode 100644
new mode 100755
index dfa00d7..d259aeb
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -628,6 +628,7 @@
                                      var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                      localDoorLockObj.UserID = curDoorLockUser.UserID;
                                      localDoorLockObj.UnlockType = curDoorLockUser.UnlockType;
+                                     localDoorLockObj.PrimaryId = curDoorLockUser.PrimaryId;
                                      localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
                                      localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks;
                                      localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;

--
Gitblit v1.8.0