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

huliguo

昨天 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponPageVo.java

@@ -22,7 +22,7 @@
    @ApiModelProperty(value="优惠券名称")
    private String couponName;

    @ApiModelProperty(value="优惠券类型1.满减2.折扣3.代金4.商品")
    @ApiModelProperty(value = "优惠券类型1.满减2.折扣3.代金4.商品")
    private Integer couponType;

    @ApiModelProperty(value = "使用限制")