Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy

xiaoyong931011

2022-09-22 7cf7a80569d3cb907e0260abc3b2dbd36ec6c4c2

 src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java

@@ -34,4 +34,10 @@

    @ApiModelProperty(value = "是否热卖", example = "1是2否")
    private Integer isHot;

    @ApiModelProperty(value = "是否套餐 1-普通商品 2-套餐", example = "2")
    private Integer isNormal;

    @ApiModelProperty(value = "1-付费商品 2-积分商品")
    private Integer goodsType;
}