Merge remote-tracking branch 'origin/master'

CeDo

2021-04-12 c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussCommentDTO.java

@@ -31,4 +31,7 @@

    @ApiModelProperty(value = "一起议主键id")
    private Long id;

    @ApiModelProperty(value = "登录用户",required = true)
    private Long loginUserId;
}