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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

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

@@ -320,7 +320,7 @@
                        //标题:选择功能类型

                        var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);



                        var form = new BottomDialogSelectForm();

                        var form = new BottomItemSelectForm();

                        form.AddForm(title, listText, nowSelectNo);

                        form.FinishSelectEvent += (selectNo) =>

                        {