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

huliguo

6 天以前 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerCouponGoodsListVo.java

@@ -20,7 +20,7 @@
    private String goodsName;

    @ApiModelProperty(value = "商品数量")
    private String goodsNum;
    private Integer goodsNum;

    @ApiModelProperty(value = "商品类型")
    private String goodsType;