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

Pu Zhibing

7 天以前 64264bb278bbfaa8df29f5f19a59d4e8345b04aa

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

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

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


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