Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-20 b1d9b2a08f05464f0130c3b93e9664bb8ec0f0b8

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java

@@ -25,6 +25,7 @@
    private Long id;

    @ApiModelProperty("一起议主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long discussId;

    @ApiModelProperty("选项内容")
@@ -48,4 +49,7 @@

    @ApiModelProperty("投票选项占比")
    private BigDecimal percent;

    @ApiModelProperty("是否需要填写原因")
    private Boolean needReason;
}