Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 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));



            //设备选择确定