Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-06 f53c26884de8f3fd5b15a5a36c5743225d8b5628

 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;