Merge branch 'acid_push' into huacheng_test

zhaozhengjie

2022-09-16 f4c8664c2d1c6d6e62f75433a27c5645942d5e85

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/DiscussVoteOptionDTO.java

@@ -18,8 +18,10 @@
@Data
@ApiModel("一起议投票请求参数")
public class DiscussVoteOptionDTO {
    @ApiModelProperty("投票内容")
    @NotEmpty(message = "投票内容不能为空")
    private List<ComActDiscussVoteOptionDTO> options;

    @ApiModelProperty("主键")
    @NotEmpty(message = "投票选项不能为空")
    private List<Long> optionIds;
    @ApiModelProperty(value = "投票人id", hidden = true)
    private Long userId;
}