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

Conflicts:
	src/main/java/com/hut/action/DsxyAction.java
Revert "版本revert 重置之后的信息版本"

This reverts commit 72b674837c054c506a269eb802d33dbb0e947121.

Signed-off-by: allen <415522571@qq.com>
Merge remote-tracking branch 'remotes/michael/master'