Feature/product 长文章支持添加商品 See merge request !123
# Conflicts: # package.json
Release/6.9.11 See merge request !122