Merge remote-tracking branch 'origin/master'

rk

13 小时以前 4d2dda710968035fa52e69dea47525985674422b

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java

@@ -209,5 +209,11 @@
    @TableField(exist = false)
    private Long pricedShopNum;

    @ApiModelProperty(value = "shopId" )
    @TableField(exist = false)
    private Integer shopId;
    @ApiModelProperty(value = "商家供货价" )
    @TableField(exist = false)
    private BigDecimal shopPrice;

}