From 0c3d9face27e194906bffe046a81b01e18faaef4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 四月 2021 16:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
index de615a6..8024915 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
@@ -37,4 +37,13 @@
     @ApiModelProperty("查询结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date end;
+
+    @ApiModelProperty(value = "登录用户",hidden = true)
+    private Long userId;
+
+    @ApiModelProperty(value = "登录用户-用于判断是否点赞和投票",hidden = true)
+    private Long loginUserId;
+
+    @ApiModelProperty("小程序使用 1 表示查询我的议题")
+    private Integer isMy;
 }

--
Gitblit v1.7.1