Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-21 f1927647ff9ca926b0a169c31e6cda09018c083d

 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;
}