Merge branch 'master' of http://120.55.44.4:10080/xujunjie/BomWeb
解决冲突
# Conflicts:
# src/pages/Detail/models/detail.js