模板配置成功
静态资源映射
模板嵌入HEADER FOOTER
JPA配置
Merge branch 'dev'

Conflicts:
	jg-admin/src/main/java/com/jg/admin/config/AppInitializer.java