Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

 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;

}