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

huliguo

2025-07-04 c5d38d650d2ac4101b1293a4f17346e7d5420076

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

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

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

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