模板渲染技术实现提交
gitignore文件
Merge remote-tracking branch 'origin/master'

Conflicts:
	process-dyna/process-dyna-application/.gitignore