添加了登陆人显示，更新了数据库
Merge branch 'master' of github.com:yidongnan/HUT

Conflicts:
	src/main/java/com/hut/action/DsxyAction.java