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

CeDo

2021-06-03 79f76bd108aae3a6bb0c7b66150e1ac69a6563a3

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

@@ -40,4 +40,10 @@

    @ApiModelProperty(value = "登录用户",hidden = true)
    private Long userId;

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

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