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

puzhibing

2025-02-05 9ce27f53094be15ee2e69c0dce31e3f324bfda99

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