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

puzhibing

2025-02-05 9ce27f53094be15ee2e69c0dce31e3f324bfda99

 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;