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

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserManagement.cs

@@ -97,7 +97,11 @@

        async void MidFrameLayoutContent()
        {
            var SubAccounList = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
            List<Shared.Phone.UserCenter.MemberInfoRes> SubAccounList = null;
            if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
            {
                SubAccounList = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
            }

            var masterAccount = new Shared.Phone.UserCenter.MemberInfoRes();
            masterAccount.Account = Shared.Common.Config.Instance.Account;