修改 userdiet  为 userdietactivity
Merge branch 'master' of https://github.com/wikimo/jinbi.git

Conflicts:
	src/mybatis.xml