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

huliguo

2025-07-25 c897a68da55d63439826d37be3cb13c5c0f95a48

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

@@ -18,7 +18,10 @@
public class AppMemberCouponPageVo {

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

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