增加几个jar依赖
Merge remote-tracking branch 'origin/master'