Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

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