From 8b13ca9086a609ef3bae76dab15faba55123d2dd Mon Sep 17 00:00:00 2001
From: Null <281575458@qq.com>
Date: 星期三, 17 三月 2021 09:17:47 +0800
Subject: [PATCH] 处理合并代码问题
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java
index 147d307..039ac2c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java
@@ -4,6 +4,7 @@
import javax.validation.constraints.NotBlank;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -25,34 +26,33 @@
@ApiModelProperty("图片地址 多个用逗号隔开")
private String photoPah;
- @ApiModelProperty("联系方式")
-
+ @ApiModelProperty(value = "联系方式",hidden = true)
private String phone;
- @ApiModelProperty("留言人id")
+ @ApiModelProperty(value = "留言人id",hidden = true)
private Long sendtoUserId;
- @ApiModelProperty("留言人姓名")
+ @ApiModelProperty(value = "留言人姓名",hidden = true)
private String sendtoUserName;
- @ApiModelProperty("状态 1 待回复 2 已回复")
+ @ApiModelProperty(value = "状态 1 待回复 2 已回复",hidden = true)
private Integer status;
- @ApiModelProperty("是否公开 1 公开 2 保密")
+ @ApiModelProperty(value = "是否公开 1 公开 2 保密",hidden = true)
private Integer ispublic;
- @ApiModelProperty("回复人主键")
+ @ApiModelProperty(value = "回复人主键",hidden = true)
private Long userId;
- @ApiModelProperty("回复人账号")
+ @ApiModelProperty(value = "回复人账号",hidden = true)
private String userAccount;
- @ApiModelProperty("回复人姓名")
+ @ApiModelProperty(value = "回复人姓名",hidden = true)
private String userName;
- @ApiModelProperty("社区主键")
+ @ApiModelProperty(value = "社区主键",hidden = true)
private Long communityId;
-
- @ApiModelProperty("回复时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "回复时间",hidden = true)
private Date createAt;
}
--
Gitblit v1.7.1