修复undo后，redo按钮不可点问题
Merge remote-tracking branch 'origin/dev' into dev