Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

old mode 100644
new mode 100755
@@ -905,6 +905,18 @@
                    return DoorLockLocalUserId + "_" + OpenLockMode.ToString();
                }
            }
            return list;
        }

        public class Residential
        {
            public string Id = string.Empty;
            public bool IsOthreShare;
            public string MainUserDistributedMark = string.Empty;
            public string Url = string.Empty;
            public string Token = string.Empty;
            public bool IsOtherAccountCtrl;
            public string doorlockmac;
        }

        public class MembershipIfon