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

huliguo

2025-07-25 c897a68da55d63439826d37be3cb13c5c0f95a48

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

@@ -29,6 +29,9 @@

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

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