finish update emit event
Merge remote-tracking branch 'refs/remotes/origin/master'
modify a bug