Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs

@@ -262,7 +262,10 @@
                var accounts = new Dictionary<string, string>();
                accounts.Add("Type", "1");
                accounts.Add("Account", Config.Instance.Guid);
                accounts.Add("AccountName",accountName);
                accounts.Add("AccountName",accountName);

                ///mac+端口是为识别是那个门锁;
                accounts.Add("MacAddr", Send.CurrentDoorLock.DeviceAddr);
                accounts.Add("Epoint", Send.CurrentDoorLock.DeviceEpoint.ToString());
                accounts.Add("UserId", userId);
                if (SelectedDeviceStatuscondition != "")
                {