From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 07 九月 2021 09:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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..dc887b8 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
@@ -1,13 +1,12 @@
package com.panzhihua.common.model.dtos.community;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.panzhihua.common.validated.AddGroup;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -18,16 +17,16 @@
@Data
@ApiModel("分页查询一起议")
public class PageComActDiscussDTO {
- @ApiModelProperty(value = "分页-当前页数",example = "1")
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
private Long pageNum;
- @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
private Long pageSize;
@ApiModelProperty("主题")
private String subject;
- @ApiModelProperty(value = "社区id",hidden = true)
+ @ApiModelProperty(value = "社区id", hidden = true)
private Long communityId;
@ApiModelProperty("查询开始时间")
@@ -37,4 +36,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