修改数据拉取模块
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/js/apply.js
	JNUSocialNetwork/WebContent/pages/js/apply.min.js
	JNUSocialNetwork/WebContent/pages/styles/apply.min.css
Merge branch 'master' into scottDev
add filter
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
Merge branch 'scottDev'