修改dao，不依赖daofacade
Merge remote-tracking branch 'origin/master'