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/MerVerifyCouponGetVo.java

@@ -18,7 +18,7 @@
public class MerVerifyCouponGetVo {

    @ApiModelProperty(value = "优惠券id")
    private String memberCouponId;
    private Long memberCouponId;

    @ApiModelProperty(value = "用户id")
    private Long userId;