代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

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

@@ -109,7 +109,7 @@
    private BigDecimal imgWidth;

    @ApiModelProperty("单张图片高度")
    private BigDecimal heightWidth;
    private BigDecimal imgHeight;

    @ApiModelProperty("是否可重复投票（1.是 2.否）")
    private Integer isRepeat;