From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java |   12 +++++++++++-
 1 files changed, 11 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 6d28df8..82a4a1e 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
@@ -106,7 +106,7 @@
     @ApiModelProperty(value = "是否需要反馈 1 是 0 不是",example = "0")
     private Integer isNeedFeedBack;
 
-    @ApiModelProperty("操作类型 1审核通过 2驳回 3反馈")
+    @ApiModelProperty("操作类型 1审核通过 2驳回 3反馈 4.完成随手拍")
     private Integer type;
 
     @ApiModelProperty(value = "登录用户id",hidden = true)
@@ -160,4 +160,14 @@
 
     @ApiModelProperty(value = "随手拍活动")
     private ComActEasyPhotoActivityVO easyPhotoActivityVO;
+
+    @ApiModelProperty(value = "关键词")
+    private String keyWord;
+
+    @ApiModelProperty(value = "反馈信息列表")
+    private List<ComActEasyPhotoFeedbackVO> photoFeedbackList;
+
+    @ApiModelProperty(value = "完成人名称")
+    private String completeName;
+
 }

--
Gitblit v1.7.1