Merge remote-tracking branch 'origin/send_coupon' into send_coupon

zxl

4 天以前 61e3917c5b0d667d23430890f45396a9bb7731ac

 framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsVO.java

@@ -35,4 +35,6 @@

    @ApiModelProperty(value = "批发商品消费规则列表")
    private List<Wholesale> wholesaleList;

    private String id;
}