[fix]代码格式化功能
Merge branch 'master' of https://github.com/putaoshu/jdf

Conflicts:
	package.json