添加注释
Merge branch '1.2' of https://github.com/jiniannet/jntemplate.git