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

WJC

2019-12-03 f8b647c263f068babb8efcc19ff4e74026a4bd28

 ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionRow.cs

@@ -132,7 +132,7 @@
                Tag = Tag
            };
            AddChidren(line);
            

            ClickBtn = new Button();
            if (click)
            {