Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -342,7 +342,7 @@


            var form = new BottomItemSelectForm();

            form.CancelCallEvent = false;//允许取消

            form.AddForm(title, listText, nowSelectNo);

            form.AddForm(title, listText, null, nowSelectNo);

            form.FinishSelectEvent += (selectNo) =>

            {

                if (selectNo == nowSelectNo)