修复吸顶不正常的问题 See merge request !1760
Feature/newfeature See merge request !1756
# Conflicts: # package.json
