From 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 16:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 7c515dd..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
@@ -1,11 +1,13 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
@@ -30,14 +32,18 @@
@ApiModelProperty("发起人名字")
private String sponsorName;
+ @ApiModelProperty("发起人头像")
+ private String imageUrl;
+
@ApiModelProperty("微心愿名称")
+ @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空")
private String wishName;
@ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成")
private Integer status;
@ApiModelProperty("集星数")
- private Integer startNum;
+ private Integer starNum;
@ApiModelProperty("形式 1分配人员 2发起活动")
private Integer form;
@@ -60,17 +66,23 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
- @ApiModelProperty("审核/分配 时间")
+ @ApiModelProperty("审核 时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date examineAt;
+
+ @ApiModelProperty("分配 时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date distributionAt;
@ApiModelProperty("评分")
private Integer score;
@ApiModelProperty("详情")
+ @NotBlank(groups = {AddGroup.class},message = "详情不能为空")
private String detail;
@ApiModelProperty("图片路径列表，逗号分隔")
+ @NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空")
private String photoPathList;
@ApiModelProperty("当前页数")
@@ -86,10 +98,12 @@
private String evaluate;
@ApiModelProperty("用户评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date evaluateAt;
- @ApiModelProperty("心愿完成时间")
- private Date finishAt;
+ @ApiModelProperty("反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date feedbackAt;
@ApiModelProperty("完成情况图片列表，逗号分隔")
private String finishPhotoPathList;
@@ -106,7 +120,23 @@
@ApiModelProperty("反馈图片集合，逗号分隔")
private String feedbackPhotoPathList;
- @ApiModelProperty("操作类型 1 审核通过 2驳回 3分配人员 4发起活动 5反馈")
+ @ApiModelProperty(value = "操作类型 1 审核通过 2驳回 3分配人员 4发起活动 5反馈",example = "1")
private Integer type;
+
+ @ApiModelProperty(value = "小程序请求 1 是 0 不是",hidden = true)
+ private Integer isApplets;
+
+ @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