# Conflicts: # package.json
Release/agreement privacy 隐私条款及样式Bug修复 See merge request !1781
Feature/yoho gain See merge request !1779
Hotfix/agreement privacy See merge request !1780
Release/6.9.9 See merge request !1778
接口输出团购价格及团购活动id See merge request !1777
用户服务协议修改 用户服务协议修改 线上拼团轮播图清晰度修改 See merge request !1773
Hotfix/show collage price See merge request !1774
Release/6.9.8 See merge request !1772