Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 3197770b87a7046e02655bea51034abdfa09ed6d

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

@@ -52,7 +52,6 @@
    private String voteTitle;

    @ApiModelProperty("选项集合")
    private List<String> discussOptions;

    private List<ComActDiscussOptionDTO> discussOptions;

}