# Conflicts: # package.json
拼团商品详情页优化 See merge request !1709
Feature/group buy See merge request !1708