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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

old mode 100755
new mode 100644
@@ -26,7 +26,7 @@
        #endregion

        /// <summary>

        /// UI显示 
        /// UI显示

        /// </summary>
        public void Show()
        {