Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 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", () =>

                {