Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-28 c0a5d6a40520cf89b9989cff58c1c64fbed47c2a

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java

@@ -42,4 +42,5 @@

    @ApiModelProperty(value = "会员名称")
    private String name;
    private Integer type;
}