综合评分dao层
Merge remote-tracking branch 'origin/master'