From 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 05 六月 2021 23:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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..76d83c6 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
@@ -32,6 +32,9 @@
@ApiModelProperty("发起人名字")
private String sponsorName;
+ @ApiModelProperty("发布人昵称")
+ private String userNickName;
+
@ApiModelProperty("发起人头像")
private String imageUrl;
@@ -82,7 +85,7 @@
private String detail;
@ApiModelProperty("图片路径列表，逗号分隔")
- @NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空")
+ //@NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空")
private String photoPathList;
@ApiModelProperty("当前页数")
@@ -98,9 +101,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 +132,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