Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-26 8b94c462ae127795cfa4a0495c723ca9b7041e10

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

@@ -56,6 +56,10 @@
    @TableField("vip_id")
    private Integer vipId;

    @ApiModelProperty(value = "1月卡2季卡3年卡")
    @TableField("vip_type")
    private Integer vipType;

    @ApiModelProperty(value = "会员开始时间")
    @TableField("start_time")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")