# Conflicts: # package.json
修复吸顶不正常的问题 See merge request !1760
Feature/newfeature See merge request !1756
Feature/home optimization See merge request !1758
Master See merge request !1757
活动域名下移除sw.js See merge request !1755
fix mars add carts See merge request !1754
Release/6.9.2 See merge request !1738