缩短结束提示
Merge branch 'branch_2048'