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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs

@@ -63,7 +63,7 @@
            btnDelete.InitControl();
            btnDelete.ButtonClickEvent += (sender, e) =>

            {

                var form = new TopRightMenuControl(this, 1, 449);

                var form = new TopRightMenuControl(1, 449);

                //清空记录

                form.AddRowMenu(Language.StringByID(R.MyInternationalizationString.uClearLog), "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>

                {