同班url错误
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork

Conflicts:
	JNUSocialNetwork/WebContent/pages/js/activityCre.js
Merge branch 'master' of https://github.com/JavaEEBoy/JNUSocialNetwork
第三种报名方式