From bf71f1fd72fa08204b67bd14a656890015b75247 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 三月 2022 22:04:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java |   15 ++++++++++++++-
 1 files changed, 14 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..f398e6d 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
@@ -43,7 +43,7 @@
     @ApiModelProperty("发起人头像")
     private String imageUrl;
 
-    @ApiModelProperty("状态 1待审核  2进行中 3已驳回 4已完成")
+    @ApiModelProperty("状态 1待审核  2进行中 3已驳回 4待评价 5.已完成")
     private Integer status;
 
     @ApiModelProperty("处理人id")
@@ -207,4 +207,17 @@
     @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<ComActMicroWishHandleVO> handleList;
+
 }

--
Gitblit v1.7.1