From c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 12 四月 2021 16:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
index 47d381c..5b53d97 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -98,9 +98,11 @@
private String evaluate;
@ApiModelProperty("用户评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date evaluateAt;
@ApiModelProperty("反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date feedbackAt;
@ApiModelProperty("完成情况图片列表，逗号分隔")
@@ -127,5 +129,14 @@
@ApiModelProperty(value = "是否点赞 1 是 0 不是",example = "1")
private Integer haveGiveThumbsUp;
+ @ApiModelProperty(value = "登录用户",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区后台登录用户",hidden = true)
+ private Long backUserId;
+
+ @ApiModelProperty(value = "是否是分页查询微心愿接口调用",hidden = true)
+ private Integer isPageMyWish;
+
}
--
Gitblit v1.7.1