From 85cf42314fc04a637f1a44e78c1e476a445bf0f3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 14 三月 2022 13:29:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java | 19 ++++++++++++++++++-
1 files changed, 18 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 1c75821..5346385 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
@@ -8,6 +8,7 @@
import javax.validation.constraints.NotBlank;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.common.ComActEasyPhotoEvaluateVo;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
@@ -43,7 +44,7 @@
@ApiModelProperty("发起人头像")
private String imageUrl;
- @ApiModelProperty("状态 1待审核 2进行中 3已驳回 4已完成")
+ @ApiModelProperty("状态 1待审核 2进行中 3已驳回 4待评价 5.已完成")
private Integer status;
@ApiModelProperty("处理人id")
@@ -207,4 +208,20 @@
@ApiModelProperty(value = "单张图片高度")
private BigDecimal imgHeight;
+ @ApiModelProperty(value = "评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date evaluateDate;
+
+ @ApiModelProperty(value = "评价分数")
+ private Integer score;
+
+ @ApiModelProperty(value = "评价内容")
+ private String content;
+
+ @ApiModelProperty(value = "评价记录")
+ private List<ComActEasyPhotoEvaluateVo> evaluateList;
+
+ @ApiModelProperty(value = "微心愿分配人员集合")
+ private List<ComActMicroWishHandleVO> handleList;
+
}
--
Gitblit v1.7.1