更新资源进度
Merge remote-tracking branch 'origin/master'