Merge branch 'test' into 'master'

罗元桥

2021-09-09 79c50faf0fe63640652da7f0c6fe5cae42018872

 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;