test更新3
Merge branch 'work' of github.com:SysArkGit/WP2_CLUB into work

Conflicts:
	WP2.CLUB/Web.config