修复瀑布流中对齐的bug
Merge remote-tracking branch 'origin/master'