修正相关的计算逻辑
Merge remote-tracking branch 'origin/master'