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

Hentua

2023-11-28 2bd6bd4cc8639794b91d0de0a6159c97ff365f86

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

@@ -37,4 +37,10 @@

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

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

    @ApiModelProperty(hidden = true)
    private Long memberId;
}