统计
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/adsl0001/renqiu
合并打印
Merge branch 'master' of https://github.com/adsl0001/renqiu

Conflicts:
	WebContent/WEB-INF/views/main/welcome.jsp
	src/com/renqiu/ggzy/web/QueryController.java