Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

old mode 100644
new mode 100755
@@ -252,7 +252,7 @@
                }
            };
        }
        #endregion 
        #endregion

        #region  添加全部菜单 
        /// <summary>