发表状态@好友
Merge remote-tracking branch 'origin/jing'