Merge remote-tracking branch 'origin/master'

xuhy

2025-11-07 7382373b1ad742f9696e5ddb93c60b3fb7ee2bdc

 ruoyi-system/src/main/java/com/ruoyi/system/model/TDeliberationVoteOption.java

@@ -38,9 +38,13 @@
    @TableField("option_content")
    private String optionContent;

    @ApiModelProperty(value = "投票人数")
    @ApiModelProperty(value = "投票人")
    @TableField("vote_count")
    private Integer voteCount;
    private String voteCount;



    @ApiModelProperty(value = "投票人数")
    @TableField(exist = false)
    private Integer voteCountNum;
}