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

tangxiaobao

2021-08-31 06650302163e395c038b37a10d5c4214ba9cc8a9

 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;