Merge remote-tracking branch 'origin/master'

puzhibing

2024-03-18 945561a655919045c3086f00d7d16dbc1d24c23f

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

@@ -76,6 +76,9 @@
    @ApiModelProperty(value = "关联活动id")
    private String relationActivityId;

    @ApiModelProperty(value = "关联活动")
    private String relationActivityName;

    @ApiModelProperty(value = "关联用户集合")
    private List<MgtCouponMemberListVo> relUserList;