Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-09 3dc9ecbf4992e3913dc0f397c29010392bb4b0e5

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GiveVipDto.java

@@ -10,5 +10,5 @@
    @ApiModelProperty("1月2季3年")
    private Integer type;
    @ApiModelProperty("用户Id")
    private Long userId;
    private String userIds;
}