UserJSON 创建
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	WebContent/usersports/userSportslist.jsp
	src/applicationContext.xml
	src/com/jinbi/mapper/UsersMapper.java
	src/com/jinbi/model/Users.xml
Merge branch 'master' of https://github.com/wikimo/jinbi

Conflicts:
	src/com/jinbi/mapper/UsersMapper.java
	src/com/jinbi/model/Users.xml
	src/com/jinbi/service/UsersService.java
	src/com/jinbi/service/impl/UsersServiceImpl.java
更新