版本控制接口
Merge branch 'master' of git@github.com:hujhdeng/deng.git
数据库文档。
关注。。
Merge branch 'master' of git@github.com:hujhdeng/deng.git
Merge branch 'master' of git@github.com:hujhdeng/deng.git
提交。。。
Merge branch 'master' of git@github.com:hujhdeng/deng.git
相互关注。
Merge branch 'master' of git@github.com:hujhdeng/deng.git

Conflicts:
	website/src/main/java/com/renrenxian/manage/dao/UserDao.java
	website/src/main/java/com/renrenxian/manage/service/impl/UserServiceImpl.java
	website/src/main/resources/com/renrenxian/manage/model/UserMapper.xml