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

huliguo

2025-05-29 cbad982befcf58521b224da1e8898c23c5e0d2c6

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