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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs

@@ -529,7 +529,7 @@
            public PageSettingInfo PageSetting = new PageSettingInfo()

            {

                Page = 1,

                PageSize = 500

                PageSize = 5000

            };

        }