运动类型 和 饮食 分类 模块
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	README.md
	WebContent/index.jsp
	WebContent/userdietactivity/replace.jsp
	WebContent/usereats/delete.jsp
	WebContent/usereats/insert.jsp
	WebContent/usereats/message.jsp
	WebContent/usereats/update.jsp
	WebContent/usereats/userEatslist.jsp
	WebContent/usergroups/message.jsp
	WebContent/usersports/sportadd.jsp
	WebContent/usersports/sportedit.jsp
	WebContent/usersports/sportlist.jsp
	jinbi.sql
	src/application_usereats.xml
	src/com/jinbi/action/JsonAction.java
	src/com/jinbi/action/UserEatsAction.java
	src/com/jinbi/action/UserSportsAction.java
	src/com/jinbi/dto/UserEatsDTO.java
	src/com/jinbi/dto/UserSportsDTO.java
	src/com/jinbi/mapper/UserDataMapper.java
	src/com/jinbi/mapper/UserDietActivityMapper.java
	src/com/jinbi/model/UserData.xml
	src/com/jinbi/model/UserDietActivity.java
	src/com/jinbi/model/UserDietActivity.xml
	src/com/jinbi/model/UserEats.java
	src/com/jinbi/model/UserEats.xml
	src/com/jinbi/model/UserSports.java
	src/com/jinbi/model/UserSports.xml
	src/com/jinbi/service/UserEatsService.java
	src/com/jinbi/service/UserSportsService.java
	src/com/jinbi/service/impl/UserEatsServiceImpl.java
	src/com/jinbi/service/impl/UserSportsServiceImpl.java
	src/mybatis.xml
	src/usereats.xml
	src/usersports.xml
更新
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	README.md