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

huanghongfa

2021-08-04 f032510cc85a50ec980c8d1ad923b7a490426b68

 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;

}