Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-14 a7adf98ff4ac801342853b1f9231cc1ab5acebf3

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

@@ -226,7 +226,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));



            //设备选择确定