除去BaseService警告
Merge remote-tracking branch 'origin/master'