bug修改
Merge remote-tracking branch 'zqb/master'