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

huanghongfa

2021-07-26 f7a3546bb4f6c0b00acb9899710ff25979a70be3

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

@@ -41,6 +41,9 @@
    @ApiModelProperty(value = "登录用户",hidden = true)
    private Long userId;

    @ApiModelProperty(value = "登录用户-用于判断是否点赞和投票",hidden = true)
    private Long loginUserId;

    @ApiModelProperty("小程序使用 1 表示查询我的议题")
    private Integer isMy;
}