Merge branch 'test' into 'yuyue_dev'

罗元桥

2021-08-30 eda58e0e6d4abdd2b060e28867d103045845aa69

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussOptionUserDTO.java

@@ -14,7 +14,6 @@
@ApiModel("选项投票")
public class ComActDiscussOptionUserDTO {


    @ApiModelProperty("一起议选项id")
    private Long discussOptionId;