Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-09 9576bebcacea938771f6f5b51d958e6a4ac59df6

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

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;

import java.math.BigDecimal;
import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
@@ -41,4 +42,7 @@

    @ApiModelProperty("是否已经投票 1 是 0 否")
    private Integer haveVote = 0;

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