# Conflicts: # package.json
# Conflicts: # apps/product/models/detail-product-api.js
jit显示接口返回标题 See merge request !164
'定金预售商品只能在APP端操作' See merge request !163