11
Merge remote-tracking branch 'origin/master'
中午

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

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

Conflicts:
	pom.xml
	src/com/gmteam/spiritdata/templet/web/TempletController.java
运行成功

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