v1bug修复

v1bug修复
Revert "v1bug修复"

This reverts commit 0fbe89eadeef4fff0a865aca2cdc8ff42e8e95dc.
第三次bug修复
Merge branch 'bug1'