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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -286,7 +286,7 @@
                }



                //获取状态的显示文本

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

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

                this.FinishSelectEvent?.Invoke(statuText, listData);



                this.CloseForm();