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

tangxiaobao

2021-07-31 cc0569d48030733d420a4cd77f3f4da405d34372

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