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

puzhibing

2025-02-06 c0ceef9f86c0abb288ade6a7770c02326848f8a4

 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;
}