# Conflicts: # package-lock.json # package.json
Hotfix/update See merge request !19
Feature/captcha See merge request !17
# Conflicts: # package.json
修改在闲鱼中时领券登录的url See merge request !16
条件搜索商品如果是团购商品，则跳转到团购商品详情 See merge request !15
fix brand url See merge request !14
