for pull
Merge branch 'master' of https://github.com/wikimo/jinbi
for pull
fix conflict
for conflict
Merge branch 'master' of https://github.com/wikimo/jinbi
refactor code by wiki
refactor by wiki