Merge branch 'test' into 'master'

罗元桥

2021-08-31 a25c8f0ccfe35369e0c60d02bf9a3309ad650dfa

 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;