实现 关联查询
王巍 的 登陆 模块 更新
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	build/classes/com/jinbi/action/LoginAction.class
	build/classes/mybatis.xml
	build/classes/struts.xml