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

tangxiaobao

2021-09-09 67494eba4305d6e5c95079d17c5b6bcd8489df82

 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;