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

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

@@ -299,7 +299,7 @@
                            foreach (var curDoorLockUser in curAccountDoorLockUserList)

                            {

                                // 账户中没有门锁用户

                                if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")

                                if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))

                                {

                                }

                                else

@@ -325,11 +325,11 @@
                            }

                            //冻结/解冻用户

                            int count1 = tempGroupId.Count;
                            if (tempGroupId.Count==1)
                            if (tempGroupId.Count == 1)
                            {
                                foreach (var a in tempGroupId)
                                {
                                    if(a.Count ==0)
                                    if (a.Count == 0)
                                    {
                                        count1 = 0;
                                        break;