Merge remote-tracking branch 'origin/master'

puzhibing

2024-11-01 6ce963b426a53aa2a06883f3eb6c0de3c270d89d

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