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

huliguo

昨天 a966dafb8877552267a94fe8c544c5ea72cf5650

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

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

    @ApiModelProperty(value = "发送类型1.手动领取2.指定发放")
    @ApiModelProperty(value = "发送类型1.手动领取2.指定发放3.抽奖领取")
    private Integer sendType;

    @ApiModelProperty(value = "发送对象2.全部用户3.会员用户4非会员用户5自定义")