commit
commit
Merge branches 'master' and 'master' of https://github.com/guivuikiong/iyiqifei

# By weijunhui
# Via weijunhui
* 'master' of https://github.com/guivuikiong/iyiqifei:
  BUG修复

# By weijunhui
# Via weijunhui
* 'master' of https://github.com/guivuikiong/iyiqifei:
  BUG修复