更新applicationContext文件里dao的配置
Merge remote-tracking branch 'origin/master'