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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 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;

            }