fix bug
解决冲突
小bug的fix，beetl模板的升级
fix
Merge pull request #1 from iveryang/master

follow