Merge remote-tracking branch 'origin/master'

rk

20 小时以前 bd491c37218b0b3d9b518e4814967d814e781c02

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/GoodsInfoResponse.java

@@ -55,6 +55,9 @@
    @ApiModelProperty(value = "最低价")
    private BigDecimal minPrice;

    @ApiModelProperty(value = "供货价")
    private BigDecimal exFactoryPrice;

    @ApiModelProperty(value = "商品详情")
    private String content;