增加百衣回调函数
Merge remote-tracking branch 'origin/master'