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

新添加了添加用户的接口
更新
更新
Merge branch 'master' of https://github.com/wikimo/jinbi

Conflicts:
	src/applicationContext.xml
	src/application_admin.xml
	src/application_adminlog.xml
	src/application_userdata.xml
	src/application_userdietactivity.xml
	src/application_usereats.xml
	src/application_usergroups.xml
	src/application_users.xml
	src/application_usersports.xml
	src/com/jinbi/config/applicationContext.xml
	src/com/jinbi/config/application_admin.xml
	src/com/jinbi/config/application_adminlog.xml
	src/com/jinbi/config/application_userdata.xml
	src/com/jinbi/config/application_userdietactivity.xml
	src/com/jinbi/config/application_usereats.xml
	src/com/jinbi/config/application_usergroups.xml
	src/com/jinbi/config/application_users.xml
	src/com/jinbi/config/application_usersports.xml
	src/com/jinbi/config/mybatis.xml
	src/com/jinbi/config/seljson.xml
	src/com/jinbi/config/struts.xml
	src/com/jinbi/config/userdietactivity.xml
	src/com/jinbi/config/usereats.xml
	src/com/jinbi/config/usergroups.xml
	src/com/jinbi/config/usersports.xml
	src/com/jinbi/dto/UserGroupsDTO.java
	src/mybatis.xml
	src/seljson.xml
	src/struts.xml
	src/userdietactivity.xml
	src/usereats.xml
	src/usergroups.xml
	src/usersports.xml
	xmlfile/applicationContext.xml
	xmlfile/application_admin.xml
	xmlfile/application_adminlog.xml
	xmlfile/application_userdata.xml
	xmlfile/application_userdietactivity.xml
	xmlfile/application_usereats.xml
	xmlfile/application_usergroups.xml
	xmlfile/application_users.xml
	xmlfile/application_usersports.xml
	xmlfile/mybatis.xml
	xmlfile/seljson.xml
	xmlfile/struts.xml
	xmlfile/userdietactivity.xml
	xmlfile/usereats.xml
	xmlfile/usergroups.xml
	xmlfile/usersports.xml
更新
更新

将xml配制文件集中整合进了一个文件夹中