Signed-off-by: mahaitao <354650951@qq.com>
Merge remote-tracking branch 'origin/master' into new

Conflicts:
	WebContent/resources/plugins/templet/jq.spirit.templet.js
	pom.xml
Merge remote-tracking branch 'origin/master' into new

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/resources/plugins/templet/jq.spirit.templet.js
	pom.xml
修改自动生成div

Signed-off-by: mahaitao <354650951@qq.com>