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

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs

old mode 100755
new mode 100644
@@ -30,7 +30,7 @@
        /// </summary>

        public bool SetCanSelect

        {

            set 
            set
            {

                m_SetCanSelect = value;

            }