功能新增
Merge branch 'master' of https://github.com/qyzywz/templates