Merge remote-tracking branch 'origin/master'

puzhibing

2024-03-18 945561a655919045c3086f00d7d16dbc1d24c23f

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyCouponVo.java

@@ -28,7 +28,7 @@
    private String userMobile;

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

    @ApiModelProperty(value = "优惠券名称")
    private String couponName;