Merge remote-tracking branch 'origin/master'

xuhy

2024-09-03 4e7f81ab7b37b5fc51c3054a36942adbcfb8dca8

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java

@@ -77,6 +77,8 @@
    @ApiModelProperty(value = "要赠送的优惠卷")
    @TableField("coupon_ids")
    private String couponIds;
    @TableField(exist = false)
    private String vipName;


}