调整异常瓶贴提示到历史状态（原修改错误）
重置
瓶贴汇总
Merge branch 'dev_1012' into dev
Merge branch 'dev'