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

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs

old mode 100755
new mode 100644
@@ -1313,6 +1313,7 @@
                            foreach (var de in room.ListDevice)
                            {
                                var device = LocalDevice.Current.GetDevice(de);

                                if (device != null)
                                {
                                    //获取设备类型的