From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期四, 10 三月 2022 09:17:40 +0800 Subject: [PATCH] Merge branch 'hemenkou_dev' into dev --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java index 116e366..1cf8c3e 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageVO.java @@ -10,49 +10,62 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + @Data @ApiModel("留言") public class ComActMessageVO { - @ApiModelProperty("主键") + @ApiModelProperty("主键") private Long id; @ApiModelProperty("留言内容") - @NotBlank(groups = {AddGroup.class},message = "留言内容不能为空") + @NotBlank(groups = {AddGroup.class}, message = "留言内容不能为空") private String msgContent; @ApiModelProperty("图片地址 多个用逗号隔开") private String photoPah; - @ApiModelProperty("留言对象联系方式") - @NotBlank(groups = {AddGroup.class},message = "联系方式不能为空") + @ApiModelProperty(value = "留言对象联系方式", hidden = true) private String phone; @ApiModelProperty("回复人id") private Long sendtoUserId; - @ApiModelProperty("回复人姓名") + @ApiModelProperty(value = "留言对象姓名", hidden = false) private String sendtoUserName; - @ApiModelProperty("状态 1 待回复 2 已回复") + @ApiModelProperty(value = "状态 1 待回复 2 已回复", hidden = false) private Integer status; - @ApiModelProperty("是否公开 1 公开 2 保密") + @ApiModelProperty(value = "是否公开 1 公开 2 保密", hidden = false) private Integer ispublic; - @ApiModelProperty("留言人主键") + @ApiModelProperty(value = "留言人主键", hidden = true) private Long userId; - @ApiModelProperty("留言人账号") + @ApiModelProperty(value = "留言人账号", hidden = false) private String userAccount; + @ApiModelProperty("留言人电话") + @NotBlank(groups = {AddGroup.class}, message = "联系方式不能为空") private String userPhone; - @ApiModelProperty("留言人姓名") + @ApiModelProperty(value = "留言人姓名", hidden = false) private String userName; - @ApiModelProperty("社区主键") + @ApiModelProperty(value = "社区主键", hidden = true) private Long communityId; - @ApiModelProperty("留言对象 1社区团队2社区团委") + @ApiModelProperty(value = "留言对象 1社区团队2社区团委", hidden = false) private Long type; - @ApiModelProperty("回复时间") + @ApiModelProperty(value = "回复时间", hidden = true) private Date createAt; + @ApiModelProperty("当前页数") + private Long pageNum; + + @ApiModelProperty("每页记录数") + private Long pageSize; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("发布开始时间") + private Date publishAtBegin; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("发布结束时间") + private Date publishAtEnd; } -- Gitblit v1.7.1