更新
更新
更新
Merge branch 'master' of https://github.com/wikimo/jinbi

Conflicts:
	WebContent/common/nav.jsp
更新

修改了接口的有关代码