Merge remote-tracking branch 'origin/master'

puzhibing

2024-11-04 2bd8d8e259059b9da355f7f00eab2c8941b5aa20

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

@@ -88,6 +88,11 @@
    private String couponIds;
    @TableField(exist = false)
    private String vipName;
    @TableField(exist = false)
    private Integer type;

    @TableField(exist = false)
    private TVip vip;