修复maven构建时报错的问题
合并
Merge remote-tracking branch 'origin/2.0' into 2.0