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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

 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;

}