提交到 自己仓库
Merge branch 'master' of https://github.com/wikimo/jinbi.git
Merge branch 'master' of https://github.com/wikimo/jinbi.git
小陆： 模块的 CRUD 代码
for pull
Merge branch 'master' of https://github.com/wikimo/jinbi
删除admin  把 usereats 放到WebContent下
饮食和运动的
delete.jsp userEatslist.jsp  和UserEatsDTO.java
时间控件   饮食模块的 添加 和 修改
Merge branch 'master' of https://github.com/wikimo/jinbi

Conflicts:
	WebContent/js/My97DatePicker/WdatePicker.js
	WebContent/js/My97DatePicker/calendar.js
	build/classes/mybatis.xml
	src/applicationContext.xml
	src/com/jinbi/mapper/UsersMapper.java
	src/com/jinbi/model/Users.xml
	src/mybatis.xml