Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-08 bb4825f57b22b841c5eb6db4d72447e6036b3c9b

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