Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

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

@@ -236,7 +236,7 @@


            //显示选择界面

            var form = new SelectDeviceForm();

            form.AddForm(list, new List<string>(), true);

            form.AddForm(list, new List<string>(), true, false);

            form.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddSensor));



            //设备选择确定