修复初始化组件时候，发生NullPointerException的错误
Merge remote-tracking branch 'origin/master'