历史趋势波形
Merge remote-tracking branch 'origin/master'