更改了dao层接口，对文档也做了修改
Merge remote-tracking branch 'origin/master'