修改bug
Merge branch 'master' of https://github.com/renjie120/rep_android