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

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetStatuSelectSwitchForm.cs

@@ -240,7 +240,7 @@
                dicTaskinfo = null;



                //获取状态的显示文本

                string statuText = HdlSafeguardLogic.Current.GetLightAlarmStatuText(listData);

                string statuText = HdlSafeguardLogic.Current.GetAdjustTargetStatuText(listData);

                this.FinishSelectEvent(statuText, listData);



                this.CloseForm();