From 14590de8e4fb23909f1767a53d1f92007f9bbcc4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 19 五月 2021 20:16:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
index 5e50974..d6abe23 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -10,6 +10,7 @@
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.util.Date;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -79,7 +80,7 @@
private Date examineAt;
@ApiModelProperty("创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("社区id")
@@ -87,6 +88,9 @@
@ApiModelProperty("点赞数量")
private Integer giveThumbsUpNum;
+
+ @ApiModelProperty("评论数量")
+ private Integer commentNum;
@ApiModelProperty("是否匿名发布 0 否 1 是")
@Min(value = 0,groups = {AddGroup.class},message = "是否匿名发布不能为空")
@@ -100,4 +104,27 @@
@ApiModelProperty("操作类型 1审核通过 2驳回 3反馈")
private Integer type;
+
+ @ApiModelProperty(value = "登录用户id",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "登录用户id",hidden = true)
+ private Long logInUserId;
+
+ @ApiModelProperty("反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAt;
+
+ @ApiModelProperty("发起人手机号")
+ private String phone;
+
+ @ApiModelProperty("拒绝原因")
+ private String rejectReason;
+
+ @ApiModelProperty(value = "后台登录人员id",hidden = true)
+ private Long backUserId;
+
+ @ApiModelProperty(value = "地址备注")
+ private String addrRemark;
+
}
--
Gitblit v1.7.1