修改tips
Merge branch 'yuwei' into beta